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/12/12 16:31:17 UTC
[isis] 02/02: ISIS-2177: runtime: rationalize package names before
further refactoring
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 75edb727480e900fe6852afd6ac378cd25b48022
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 17:31:03 2019 +0100
ISIS-2177: runtime: rationalize package names before further refactoring
---
.../datanucleus/DataNucleusLifeCycleHelper.java | 2 +-
.../commands/DataNucleusCreateObjectCommand.java | 2 +-
.../queries/PersistenceQueryProcessor.java | 2 +-
.../queries/PersistenceQueryProcessorAbstract.java | 2 +-
.../service/JdoPersistenceLifecycleService.java | 10 +++---
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 4 +--
.../JdoStoreLifecycleListenerForIsis.java | 6 ++--
.../JdoPersistenceCapableFacetAbstract.java | 2 +-
.../metrics/MetricsServiceDefault.java | 3 +-
.../objectadapter/ObjectAdapterContext.java | 4 +--
.../ObjectAdapterContext_DependencyInjection.java | 2 +-
.../ObjectAdapterContext_Factories.java | 2 +-
...ObjectAdapterContext_LifecycleEventSupport.java | 2 +-
.../ObjectAdapterContext_NewIdentifier.java | 2 +-
...ctAdapterContext_ObjectAdapterByIdProvider.java | 4 +--
...ObjectAdapterContext_ObjectAdapterProvider.java | 2 +-
.../ObjectAdapterContext_ObjectCreation.java | 2 +-
.../DataNucleusApplicationComponents5.java | 2 +-
.../persistence/IsisPersistenceSessionJdo.java | 2 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 4 +--
.../IsisPlatformTransactionManagerForJdo.java | 12 +++----
.../persistence/IsisTransactionJdo.java | 8 ++---
.../persistence/IsisTransactionManagerJdo.java | 6 ++--
.../persistence/PersistenceSession5.java | 2 +-
.../persistence/PersistenceSessionFactory5.java | 6 ++--
.../WrapperFactoryDefault_wrappedObject_Test.java | 2 +-
...actoryDefault_wrappedObject_transient_Test.java | 2 +-
.../auth/AuthenticationSessionProviderDefault.java | 4 +--
.../background/CommandExecutionAbstract.java | 2 +-
.../background/CommandExecutorServiceDefault.java | 6 ++--
.../services/factory/FactoryServiceDefault.java | 2 +-
.../services/message/MessageServiceDefault.java | 2 +-
.../publish/PublisherDispatchServiceDefault.java | 3 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../sessmgmt/SessionManagementServiceDefault.java | 4 +--
.../runtime/services/wrapper/AsyncWrapDefault.java | 4 +--
.../services/wrapper/WrapperFactoryDefault.java | 2 +-
.../services/xactn/TransactionServiceSpring.java | 4 +--
.../changes/PreAndPostValues_shouldAudit_Test.java | 4 +--
.../org/apache/isis/runtime/IsisModuleRuntime.java | 16 ++++-----
.../runtime/{system => }/context/IsisContext.java | 8 ++---
.../context/session/AppLifecycleEvent.java | 2 +-
.../context/session/RuntimeContext.java | 2 +-
.../context/session/RuntimeContextBase.java | 4 +--
.../context/session/RuntimeEventService.java | 4 +--
.../session/RuntimeEventSupport_Spring.java | 2 +-
.../context/session/SessionLifecycleEvent.java | 4 +--
.../runtime/persistence/adapter/PojoAdapter.java | 2 +-
.../query/PersistenceQueryAbstract.java | 2 +-
.../session}/PersistenceQuery.java | 2 +-
.../session}/PersistenceQueryFactory.java | 2 +-
.../session}/PersistenceSession.java | 2 +-
.../session}/PersistenceSessionFactory.java | 2 +-
.../session}/events/PersistenceEventService.java | 2 +-
.../events/PersistenceEventService_Spring.java | 2 +-
.../session}/events/PostStoreEvent.java | 2 +-
.../session}/events/PreStoreEvent.java | 2 +-
.../session}/events/TimestampService.java | 2 +-
.../transaction/AdapterAndProperty.java | 2 +-
.../transaction/AuditerDispatchService.java | 2 +-
.../transaction/ChangedObjectsService.java | 2 +-
.../transaction/IsisTransactionAspectSupport.java | 2 +-
.../transaction/IsisTransactionFlushException.java | 2 +-
.../IsisTransactionManagerException.java | 2 +-
.../transaction/IsisTransactionObject.java | 2 +-
.../transaction/IsisTransactionPlaceholder.java | 2 +-
.../transaction/PreAndPostValues.java | 2 +-
.../{system => }/session/IsisRequestCycle.java | 4 +--
.../runtime/{system => }/session/IsisSession.java | 8 ++---
.../{system => }/session/IsisSessionFactory.java | 4 +--
.../session/IsisSessionFactoryDefault.java | 8 ++---
.../session/SessionFactoryException.java | 2 +-
.../init}/InitialisationSession.java | 2 +-
.../init}/IsisLocaleInitializer.java | 2 +-
.../init}/IsisTimeZoneInitializer.java | 2 +-
.../template}/AbstractIsisSessionTemplate.java | 8 ++---
.../isis/runtime/system/IsisSystemException.java | 41 ----------------------
.../ExceptionRecognizerTranslate.java | 2 +-
.../viewer/context/ResourceContext.java | 2 +-
.../viewer/resources/ResourceAbstract.java | 4 +--
.../viewer/resources/SwaggerSpecResource.java | 2 +-
.../webmodule/IsisRestfulObjectsSessionFilter.java | 2 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 6 ++--
.../context/ResourceContext_getArg_Test.java | 6 ++--
.../actionmenu/serviceactions/CssMenuItem.java | 2 +-
.../ajaxtable/PrototypingMessageProvider.java | 2 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../widgets/themepicker/ThemeChooser.java | 2 +-
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../ui/pages/accmngt/EmailAvailableValidator.java | 2 +-
.../pages/accmngt/UsernameAvailableValidator.java | 2 +-
.../ui/pages/accmngt/register/RegisterPanel.java | 2 +-
.../isis/viewer/wicket/ui/pages/home/HomePage.java | 2 +-
.../wicket/ui/pages/login/IsisSignInPanel.java | 2 +-
.../wicket/ui/panels/FormExecutorDefault.java | 4 +--
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../AuthenticatedWebSessionForIsis.java | 2 +-
.../viewer/integration/LocalizerForIsis.java | 4 +--
.../viewer/integration/WebRequestCycleForIsis.java | 8 ++---
.../services/mementos/ObjectUnmarshaller.java | 2 +-
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...uthenticatedWebSessionForIsis_TestAbstract.java | 2 +-
.../webapp/context/IsisWebAppCommonContext.java | 2 +-
.../excel/dom/util/ExcelServiceImpl.java | 4 +--
.../secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 2 +-
.../fixtures/FixturesLifecycleService.java | 2 +-
.../extensions/sse/services/SseServiceDefault.java | 4 +--
110 files changed, 176 insertions(+), 215 deletions(-)
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
index b375713..f8fb935 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
@@ -22,7 +22,7 @@ import javax.jdo.PersistenceManagerFactory;
import org.datanucleus.enhancer.EnhancementHelper;
-import org.apache.isis.runtime.system.context.IsisContext;
+import org.apache.isis.runtime.context.IsisContext;
/**
*
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
index e66dbd1..feaeff6 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
@@ -22,7 +22,7 @@ import javax.jdo.PersistenceManager;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
index e36e9d8..2877db5 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
@@ -21,7 +21,7 @@ package org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.que
import java.util.List;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.system.persistence.PersistenceQuery;
+import org.apache.isis.runtime.persistence.session.PersistenceQuery;
public interface PersistenceQueryProcessor<T extends PersistenceQuery> {
List<ObjectAdapter> process(T query);
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
index f2cd976..5e7b540 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -30,8 +30,8 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisLifecycleListener;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
+import org.apache.isis.runtime.persistence.session.PersistenceQuery;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.system.persistence.PersistenceQuery;
public abstract class PersistenceQueryProcessorAbstract<T extends PersistenceQuery>
implements PersistenceQueryProcessor<T> {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index 03eb9cc..9102cd0 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -33,11 +33,11 @@ import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.system.context.session.AppLifecycleEvent;
-import org.apache.isis.runtime.system.context.session.SessionLifecycleEvent;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.context.session.AppLifecycleEvent;
+import org.apache.isis.runtime.context.session.SessionLifecycleEvent;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.persistence.session.PersistenceSessionFactory;
+import org.apache.isis.runtime.session.IsisSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
index 09d5da8..49af7a8 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
@@ -52,8 +52,8 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.ObjectPersistenceException;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
index 0684769..b208777 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
@@ -22,9 +22,9 @@ import javax.inject.Inject;
import javax.jdo.listener.InstanceLifecycleEvent;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoMetamodelUtil;
-import org.apache.isis.runtime.system.persistence.events.PersistenceEventService;
-import org.apache.isis.runtime.system.persistence.events.PostStoreEvent;
-import org.apache.isis.runtime.system.persistence.events.PreStoreEvent;
+import org.apache.isis.runtime.persistence.session.events.PersistenceEventService;
+import org.apache.isis.runtime.persistence.session.events.PostStoreEvent;
+import org.apache.isis.runtime.persistence.session.events.PreStoreEvent;
import lombok.val;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
index 299a85b..120b6f9 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
@@ -23,11 +23,11 @@ import java.util.Map;
import javax.jdo.annotations.IdentityType;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
public abstract class JdoPersistenceCapableFacetAbstract
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
index e853bf6..0279a43 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
@@ -32,7 +32,8 @@ import javax.jdo.listener.LoadLifecycleListener;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.WithTransactionScope;
import org.apache.isis.applib.services.metrics.MetricsService;
-import org.apache.isis.runtime.system.transaction.ChangedObjectsService;
+import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index 08b5fc8..9912cfd 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -38,8 +38,8 @@ import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.context.session.RuntimeContextBase;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
index d8bc7c5..a08e6b1 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Modifier;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.system.context.session.RuntimeContext;
+import org.apache.isis.runtime.context.session.RuntimeContext;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
index 9878ad6..c2c04cc 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
@@ -26,7 +26,7 @@ import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapterContext.ObjectAdapterFactories;
import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
index 23c7f13..b7c2875 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.commons.internal.factory.InstanceUtil;
import org.apache.isis.metamodel.facets.object.callbacks.LifecycleEventFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.system.context.session.RuntimeContext;
+import org.apache.isis.runtime.context.session.RuntimeContext;
import lombok.val;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
index 2d114fe..0279111 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
@@ -23,7 +23,7 @@ import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
import lombok.RequiredArgsConstructor;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
index 3d14f24..69f78cd 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
@@ -34,8 +34,8 @@ import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.context.session.RuntimeContext;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
import lombok.val;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
index 97b33b4..b72f790 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -23,7 +23,7 @@ import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.context.session.RuntimeContext;
+import org.apache.isis.runtime.context.session.RuntimeContext;
import lombok.val;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
index eda3484..9847b46 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
@@ -32,7 +32,7 @@ import org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtime.system.context.session.RuntimeContext;
+import org.apache.isis.runtime.context.session.RuntimeContext;
import lombok.extern.log4j.Log4j2;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
index ee7d503..cca51a9 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
@@ -44,9 +44,9 @@ import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusLifeC
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusPropertiesAware;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.facets.object.query.JdoNamedQuery;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.facets.object.query.JdoQueryFacet;
+import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.context.IsisContext;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
index 21a5e83..135be6f 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
@@ -21,7 +21,7 @@ package org.apache.isis.persistence.jdo.datanucleus5.persistence;
import org.apache.isis.commons.internal.components.SessionScopedComponent;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.runtime.persistence.objectstore.transaction.TransactionalResource;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
/**
*
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 9444227..ead70f3 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -42,8 +42,8 @@ import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.persistence.PersistenceQueryFactory;
-import org.apache.isis.runtime.system.transaction.ChangedObjectsService;
+import org.apache.isis.runtime.persistence.session.PersistenceQueryFactory;
+import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 487f751..853959a 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -32,12 +32,12 @@ import org.springframework.transaction.support.AbstractPlatformTransactionManage
import org.springframework.transaction.support.DefaultTransactionStatus;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.runtime.system.internal.InitialisationSession;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.system.transaction.IsisTransactionObject;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.init.InitialisationSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
index d943d26..d2f411a 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
@@ -39,10 +39,10 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.transaction.AuditerDispatchService;
-import org.apache.isis.runtime.system.transaction.IsisTransactionFlushException;
-import org.apache.isis.runtime.system.transaction.IsisTransactionManagerException;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.persistence.transaction.AuditerDispatchService;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionFlushException;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerException;
import lombok.Getter;
import lombok.val;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
index d049576..79c24d0 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
@@ -29,9 +29,9 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.components.SessionScopedComponent;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.system.transaction.IsisTransactionManagerException;
-import org.apache.isis.runtime.system.transaction.IsisTransactionObject;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerException;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
import lombok.Getter;
import lombok.val;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
index 7a8b186..def2863 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
@@ -89,7 +89,7 @@ import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObject
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import org.apache.isis.runtime.system.persistence.PersistenceQuery;
+import org.apache.isis.runtime.persistence.session.PersistenceQuery;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import static java.util.Objects.requireNonNull;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index 31fcb86..5f1845b 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -47,8 +47,8 @@ import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusSetti
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.JDOStateManagerForIsis;
import org.apache.isis.persistence.jdo.datanucleus5.entities.JdoEntityTypeRegistry;
import org.apache.isis.persistence.jdo.datanucleus5.lifecycles.JdoStoreLifecycleListenerForIsis;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.persistence.session.PersistenceSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
@@ -205,7 +205,7 @@ implements PersistenceSessionFactory, FixturesInstalledStateHolder {
}
/**
- * Called by {@link org.apache.isis.runtime.system.session.IsisSessionFactory#openSession(AuthenticationSession)}.
+ * Called by {@link org.apache.isis.runtime.session.IsisSessionFactory#openSession(AuthenticationSession)}.
*/
@Override
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 99e2c4b..ce78155 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -63,7 +63,7 @@ import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDef
import org.apache.isis.runtime.services.wrapper.dom.employees.Employee;
import org.apache.isis.runtime.services.wrapper.dom.employees.EmployeeRepository;
import org.apache.isis.runtime.services.wrapper.dom.employees.EmployeeRepositoryImpl;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 3c86d12..85c96f7 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -59,7 +59,7 @@ import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.runtime.services.wrapper.dom.employees.Employee;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
index 011be11..97fe70f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
@@ -32,8 +32,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.metamodel.services.user.UserServiceDefault;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java
index 8e39883..805aae9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.runtime.sessiontemplate.AbstractIsisSessionTemplate;
+import org.apache.isis.runtime.session.template.AbstractIsisSessionTemplate;
/**
*/
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
index a91b6dd..9c946df 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
@@ -55,9 +55,9 @@ import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.context.IsisContext;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.ActionDto;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.cmd.v1.MemberDto;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
index d8b5520..9b7af82 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
@@ -41,7 +41,7 @@ import org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
index 3628d69..1e47235 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.MessageBroker;
@Service
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
index 8671c59..b1df8b7 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
@@ -47,7 +47,8 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet;
import org.apache.isis.metamodel.services.publishing.PublisherDispatchService;
-import org.apache.isis.runtime.system.transaction.ChangedObjectsService;
+import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
index 8b9d977..ee2dfac 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
@@ -46,7 +46,7 @@ import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
import lombok.extern.log4j.Log4j2;
import lombok.val;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index a5096e0..0212555 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -29,8 +29,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.extern.log4j.Log4j2;
import lombok.val;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java
index ba6fc00..7ffd75b 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.runtime.system.context.IsisContext;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
index 0fc3af3..6f55fad 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
@@ -66,7 +66,7 @@ import org.apache.isis.runtime.services.wrapper.dispatchers.InteractionEventDisp
import org.apache.isis.runtime.services.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
import org.apache.isis.runtime.services.wrapper.handlers.ProxyContextHandler;
import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
index 9eb0ef8..fa99722 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
@@ -39,8 +39,8 @@ 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.commons.internal.exceptions._Exceptions;
-import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.system.transaction.IsisTransactionObject;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
index 8ee161c..c5ae1f0 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
@@ -20,8 +20,8 @@ package org.apache.isis.runtime.services.changes;
import org.junit.Test;
-import org.apache.isis.runtime.system.transaction.IsisTransactionPlaceholder;
-import org.apache.isis.runtime.system.transaction.PreAndPostValues;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionPlaceholder;
+import org.apache.isis.runtime.persistence.transaction.PreAndPostValues;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java b/core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java
index f859396..b19a1ff 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java
@@ -22,14 +22,14 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.metamodel.IsisModuleMetamodel;
-import org.apache.isis.runtime.system.context.session.RuntimeEventService;
-import org.apache.isis.runtime.system.context.session.RuntimeEventSupport_Spring;
-import org.apache.isis.runtime.system.persistence.events.PersistenceEventService;
-import org.apache.isis.runtime.system.persistence.events.PersistenceEventService_Spring;
-import org.apache.isis.runtime.system.persistence.events.TimestampService;
-import org.apache.isis.runtime.system.session.IsisSessionFactoryDefault;
-import org.apache.isis.runtime.system.transaction.AuditerDispatchService;
-import org.apache.isis.runtime.system.transaction.ChangedObjectsService;
+import org.apache.isis.runtime.context.session.RuntimeEventService;
+import org.apache.isis.runtime.context.session.RuntimeEventSupport_Spring;
+import org.apache.isis.runtime.persistence.session.events.PersistenceEventService;
+import org.apache.isis.runtime.persistence.session.events.PersistenceEventService_Spring;
+import org.apache.isis.runtime.persistence.session.events.TimestampService;
+import org.apache.isis.runtime.persistence.transaction.AuditerDispatchService;
+import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
@Configuration
@Import({
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
index 3242c09..d32bc20 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.context;
+package org.apache.isis.runtime.context;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -24,9 +24,9 @@ import java.util.function.Supplier;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/AppLifecycleEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/AppLifecycleEvent.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java
index aa1c9d6..b60078c 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/AppLifecycleEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.context.session;
+package org.apache.isis.runtime.context.session;
import lombok.Getter;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
index 798b2a9..16ff51f 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.context.session;
+package org.apache.isis.runtime.context.session;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
index fc98adf..1bdf2bc 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.context.session;
+package org.apache.isis.runtime.context.session;
import java.util.function.Supplier;
@@ -28,7 +28,7 @@ import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.services.homepage.HomePageAction;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventService.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventService.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
index fa5ea6f..51d0d43 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.context.session;
+package org.apache.isis.runtime.context.session;
import lombok.extern.log4j.Log4j2;
@@ -30,7 +30,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
/**
*
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java
index b8f579f..df02889 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.context.session;
+package org.apache.isis.runtime.context.session;
import javax.enterprise.event.Event;
import javax.inject.Named;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/SessionLifecycleEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java
similarity index 91%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/SessionLifecycleEvent.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java
index 65e5a8a..afe76f4 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/SessionLifecycleEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.context.session;
+package org.apache.isis.runtime.context.session;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
import lombok.Getter;
import lombok.ToString;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
index 1b387bf..b8c2b25 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
@@ -31,7 +31,7 @@ import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java
index ca146da..dc88b18 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.persistence.query;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.system.persistence.PersistenceQuery;
+import org.apache.isis.runtime.persistence.session.PersistenceQuery;
public abstract class PersistenceQueryAbstract implements PersistenceQuery {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceQuery.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQuery.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceQuery.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQuery.java
index 5e6048b..fc87ab7 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceQuery.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQuery.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.persistence;
+package org.apache.isis.runtime.persistence.session;
import org.apache.isis.applib.query.Query;
import org.apache.isis.metamodel.spec.ObjectSpecification;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceQueryFactory.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQueryFactory.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceQueryFactory.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQueryFactory.java
index 5e441a9..878765a 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceQueryFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQueryFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence;
+package org.apache.isis.runtime.persistence.session;
import java.util.Map;
import java.util.function.Function;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSession.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java
index ed929ca..5013cec 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence;
+package org.apache.isis.runtime.persistence.session;
import java.util.List;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSessionFactory.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java
index 1c1fe18..145a021 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence;
+package org.apache.isis.runtime.persistence.session;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
index 8bde4d5..89e943f 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.events;
+package org.apache.isis.runtime.persistence.session.events;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService_Spring.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService_Spring.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java
index 8d81804..e7344fc 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.events;
+package org.apache.isis.runtime.persistence.session.events;
import javax.enterprise.event.Event;
import javax.inject.Named;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PostStoreEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PostStoreEvent.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PostStoreEvent.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PostStoreEvent.java
index 7ac2fde..9319aa9 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PostStoreEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PostStoreEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.events;
+package org.apache.isis.runtime.persistence.session.events;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PreStoreEvent.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PreStoreEvent.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java
index e2e809a..70f36f8 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PreStoreEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.events;
+package org.apache.isis.runtime.persistence.session.events;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/TimestampService.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
index 1d60bcf..cc97504 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.events;
+package org.apache.isis.runtime.persistence.session.events;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AdapterAndProperty.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AdapterAndProperty.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java
index 650ac8d..d38b837 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AdapterAndProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AuditerDispatchService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AuditerDispatchService.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
index f53a331..7d14b49 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AuditerDispatchService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
import java.util.List;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
similarity index 99%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsService.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
index 243dd31..271e052 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
import java.util.Collections;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionAspectSupport.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionAspectSupport.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java
index 55afd1d..3ffe11c 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionAspectSupport.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
import java.util.Optional;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionFlushException.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionFlushException.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java
index 3de71a9..d2b0230 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionFlushException.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionManagerException.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionManagerException.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java
index a467594..f3a0171 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionManagerException.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionObject.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionObject.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java
index 04af4b6..82fabc3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionObject.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
import java.util.concurrent.CountDownLatch;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionPlaceholder.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionPlaceholder.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java
index 7f6e3db7..7d31ea4 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionPlaceholder.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
/**
*
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PreAndPostValues.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PreAndPostValues.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java
index 9ffbe14..6022a32 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PreAndPostValues.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.transaction;
+package org.apache.isis.runtime.persistence.transaction;
import java.util.Map;
import java.util.Objects;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisRequestCycle.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisRequestCycle.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java
index 35b947a..98bde3b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisRequestCycle.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.session;
+package org.apache.isis.runtime.session;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
index 4ddd752..4071f90 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.session;
+package org.apache.isis.runtime.session;
import java.util.Optional;
@@ -26,9 +26,9 @@ import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.commons.ToString;
-import org.apache.isis.runtime.system.context.session.RuntimeContextBase;
-import org.apache.isis.runtime.system.context.session.RuntimeEventService;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.runtime.context.session.RuntimeEventService;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.MessageBroker;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactory.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
index 5c20028..01fb3e5 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.runtime.system.session;
+package org.apache.isis.runtime.session;
import java.util.concurrent.Callable;
import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.runtime.system.internal.InitialisationSession;
+import org.apache.isis.runtime.session.init.InitialisationSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
index bdd018c..aec56d7 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.session;
+package org.apache.isis.runtime.session;
import java.io.File;
import java.util.Set;
@@ -42,9 +42,9 @@ import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.context.session.RuntimeEventService;
-import org.apache.isis.runtime.system.internal.IsisLocaleInitializer;
-import org.apache.isis.runtime.system.internal.IsisTimeZoneInitializer;
+import org.apache.isis.runtime.context.session.RuntimeEventService;
+import org.apache.isis.runtime.session.init.IsisLocaleInitializer;
+import org.apache.isis.runtime.session.init.IsisTimeZoneInitializer;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/SessionFactoryException.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/SessionFactoryException.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/session/SessionFactoryException.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/SessionFactoryException.java
index ab95a71..e6aa9bd 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/SessionFactoryException.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/SessionFactoryException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.session;
+package org.apache.isis.runtime.session;
public class SessionFactoryException extends Exception {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java
index 9de0867..1b826be 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.internal;
+package org.apache.isis.runtime.session.init;
import java.io.IOException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
index 3988d82..7380f55 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.internal;
+package org.apache.isis.runtime.session.init;
import java.util.Locale;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
index a2e3076..f50c3e2 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system.internal;
+package org.apache.isis.runtime.session.init;
import java.util.TimeZone;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/sessiontemplate/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java
similarity index 92%
rename from core/runtime/src/main/java/org/apache/isis/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
rename to core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java
index eeb1bf3..6defee3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.sessiontemplate;
+package org.apache.isis.runtime.session.template;
import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
public abstract class AbstractIsisSessionTemplate {
@@ -52,7 +52,7 @@ public abstract class AbstractIsisSessionTemplate {
* {@link #doExecuteWithTransaction(Object)}.
*
* <p>
- * This method is called within a current {@link org.apache.isis.runtime.system.session.IsisSession session},
+ * This method is called within a current {@link org.apache.isis.runtime.session.IsisSession session},
* but with no current transaction. The default implementation sets up a
* {@link org.apache.isis.jdo.persistence.IsisTransactionJdo transaction}
* and then calls {@link #doExecuteWithTransaction(Object)}. Override if you require more sophisticated
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemException.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemException.java
deleted file mode 100644
index 48fa1fd..0000000
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.runtime.system;
-
-public class IsisSystemException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public IsisSystemException() {
- }
-
- public IsisSystemException(final String message) {
- super(message);
- }
-
- public IsisSystemException(final Throwable cause) {
- super(cause);
- }
-
- public IsisSystemException(final String message, final Throwable cause) {
- super(message, cause);
- }
-
-}
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
index 163d06f..0815dab 100644
--- a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
+++ b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
@@ -24,7 +24,7 @@ import org.junit.runners.model.Statement;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.RequiredArgsConstructor;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
index fe17578..5e9a31b 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
@@ -39,7 +39,7 @@ import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.system.context.session.RuntimeContextBase;
+import org.apache.isis.runtime.context.session.RuntimeContextBase;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.DomainModel;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index eb53563..aea5404 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -37,8 +37,8 @@ import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.context.IsisContext;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
index 3863628..b427f92 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
@@ -31,7 +31,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.webapp.util.IsisWebAppUtils;
import lombok.RequiredArgsConstructor;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
index 43487be..1045dd2 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
@@ -44,7 +44,7 @@ import org.apache.isis.commons.internal.factory.InstanceUtil;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.webapp.util.IsisWebAppUtils;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategy;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyDefault;
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 7a71b53..7dd0c28 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -39,9 +39,9 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 921ea1e..437ddcb 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -37,9 +37,9 @@ import org.apache.isis.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 867fd0e..b97ad04 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -38,7 +38,7 @@ import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.runtime.system.context.IsisContext;
+import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index 1c8bf7e..8ea4d18 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -22,7 +22,7 @@ import java.util.Locale;
import org.apache.isis.commons.internal.base._Timing;
import org.apache.isis.commons.internal.base._Timing.StopWatch;
-import org.apache.isis.runtime.system.context.IsisContext;
+import org.apache.isis.runtime.context.IsisContext;
/**
* Responsibility: produce additional info when in prototyping mode
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 276fb4b..962159c 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -43,7 +43,7 @@ import org.apache.isis.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 0b6a2a7..ecc1f05 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -35,7 +35,7 @@ import org.wicketstuff.select2.Settings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index 3d8c62b..e3d99d6 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -32,7 +32,7 @@ import org.apache.wicket.util.cookies.CookieUtils;
import org.apache.wicket.util.string.Strings;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.settings.ActiveThemeProvider;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index 1d2756d..cd7479c 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -23,7 +23,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 1b19052..0d485ac 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -22,7 +22,7 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index 479bdc0..eafcd9e 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -22,7 +22,7 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index b7d0a92..e850300 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
@@ -37,7 +37,7 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.isis.applib.services.userreg.UserDetails;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.UsernameAvailableValidator;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
index 07988e2..4dd6e16 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
@@ -23,7 +23,7 @@ import org.apache.wicket.authroles.authorization.strategies.role.annotations.Aut
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 2cd1efd..ca71255 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -32,7 +32,7 @@ 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.commons.collections.Can;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index f22fc94..6c08b9f 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -48,8 +48,8 @@ import org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet;
import org.apache.isis.metamodel.facets.properties.renderunchanged.UnchangingFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.session.IsisRequestCycle;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisRequestCycle;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 75052d8..0c45d21 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index c3e6215..610fbd0 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -30,7 +30,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
index 403f5a8..5dbb13b 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
@@ -34,8 +34,8 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
/**
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 1713cc7..1f72290 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -52,10 +52,10 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.runtime.system.context.IsisContext;
-import org.apache.isis.runtime.system.session.IsisRequestCycle;
-import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.session.IsisRequestCycle;
+import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
index 8818b10..44a25c8 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
@@ -30,7 +30,7 @@ import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
import static org.apache.isis.commons.internal.functions._Predicates.not;
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 462c594..9015f7f 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -25,7 +25,7 @@ import java.util.Optional;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.security.api.authentication.standard.Authenticator;
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index 9024086..933d8fe 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -25,7 +25,7 @@ import java.util.Optional;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.security.api.authentication.standard.Authenticator;
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index c33ea57..54de880 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java b/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
index d0bb697..294b1ac 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
@@ -32,7 +32,7 @@ import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.webapp.context.memento.ObjectMemento;
import org.apache.isis.webapp.context.memento.ObjectMementoService;
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java
index e28137c..ec177f4 100644
--- a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java
+++ b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java
@@ -22,8 +22,8 @@ import org.apache.isis.extensions.excel.dom.WorksheetContent;
import org.apache.isis.extensions.excel.dom.WorksheetSpec;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.context.session.RuntimeContextBase;
-import org.apache.isis.runtime.system.session.IsisSession;
+import org.apache.isis.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.runtime.session.IsisSession;
import lombok.SneakyThrows;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index 86d9522..2aeca90 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.runtime.system.context.session.AppLifecycleEvent;
+import org.apache.isis.runtime.context.session.AppLifecycleEvent;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
index d47515a..c27efac 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
@@ -25,6 +25,7 @@ import java.util.function.Supplier;
import javax.inject.Inject;
import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authorization.standard.Authorizor;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
@@ -47,7 +48,6 @@ import org.apache.isis.extensions.secman.api.SecurityRealmCharacteristic;
import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
index 52a6bc0..6ef2ae0 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.runtime.session.IsisSessionFactory;
@Service
@Named("isisExtFixtures.FixturesLifecycleService")
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
index 42a8da0..05aaa16 100644
--- a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
+++ b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
@@ -45,8 +45,8 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.extensions.sse.api.SseChannel;
import org.apache.isis.extensions.sse.api.SseService;
import org.apache.isis.extensions.sse.api.SseSource;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.Getter;
import lombok.RequiredArgsConstructor;