You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 18:35:27 UTC
[isis] 02/14: ISIS-2259: fixes up package name for isis-core-runtime
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7c42bbcbd026e81d3232b8ffcf815ffd87e1d5c0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:28:57 2020 +0000
ISIS-2259: fixes up package name for isis-core-runtime
---
.../runtime/IsisCoreModuleRuntime.java} | 18 ++++++++--------
.../{ => core}/runtime/context/IsisContext.java | 8 ++++----
.../runtime/context/session/AppLifecycleEvent.java | 2 +-
.../runtime/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 ++--
.../persistence/adapter/ObjectAdapterForBean.java | 2 +-
.../runtime/persistence/adapter/PojoAdapter.java | 4 ++--
.../persistence/session/PersistenceSession.java | 2 +-
.../session/PersistenceSessionFactory.java | 2 +-
.../session/events/PersistenceEventService.java | 2 +-
.../events/PersistenceEventService_Spring.java | 2 +-
.../persistence/session/events/PostStoreEvent.java | 2 +-
.../persistence/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 +-
.../persistence/transaction/PreAndPostValues.java | 2 +-
.../events/TransactionAfterBeginEvent.java | 4 ++--
.../events/TransactionAfterCommitEvent.java | 4 ++--
.../events/TransactionAfterRollbackEvent.java | 4 ++--
.../events/TransactionBeforeBeginEvent.java | 4 ++--
.../events/TransactionBeforeCommitEvent.java | 4 ++--
.../events/TransactionBeforeRollbackEvent.java | 4 ++--
.../events/TransactionEventAbstract.java | 4 ++--
.../runtime/session/IsisRequestCycle.java | 4 ++--
.../{ => core}/runtime/session/IsisSession.java | 8 ++++----
.../runtime/session/IsisSessionFactory.java | 4 ++--
.../runtime/session/IsisSessionFactoryDefault.java | 8 ++++----
.../runtime/session/SessionFactoryException.java | 2 +-
.../session/init/InitialisationSession.java | 2 +-
.../session/init/IsisLocaleInitializer.java | 2 +-
.../session/init/IsisTimeZoneInitializer.java | 2 +-
.../template/AbstractIsisSessionTemplate.java | 8 ++++----
.../adapterfactory/pojo/RuntimeTestPojo.java | 2 +-
.../isis/{ => core}/runtime/system/Interface1.java | 2 +-
.../runtime/system/JavaActionTestObject.java | 2 +-
.../JavaObjectWithBasicProgramConventions.java | 2 +-
.../system/JavaObjectWithOneToOneAssociations.java | 2 +-
.../runtime/system/JavaReferencedObject.java | 2 +-
.../system/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../system/OneToManyAssociationDefaultTest.java | 2 +-
.../{ => core}/runtime/system/RuntimeTestPojo.java | 2 +-
.../runtime/system/TestDomainObject.java | 2 +-
.../isis/{ => core}/runtime/system/TestObject.java | 2 +-
.../runtime/system/TestObjectAsAggregated.java | 2 +-
.../runtime/system/TestObjectAsService.java | 2 +-
.../runtime/system/TestObjectWithCollection.java | 2 +-
.../system/TypeExtractorMethodReturnTest.java | 8 +++-----
.../system/TypeExtractorMethodsParametersTest.java | 2 +-
.../fixture/budget/SomeServiceToInclude.java | 2 +-
.../budgetassignment/SomeServiceNotToInclude.java | 2 +-
.../runtimeservices/IsisModuleRuntimeServices.java | 2 +-
.../auth/AuthenticationSessionProviderDefault.java | 4 ++--
.../background/CommandExecutionAbstract.java | 2 +-
.../command/CommandExecutorServiceDefault.java | 6 +++---
.../factory/FactoryServiceDefault.java | 2 +-
.../message/MessageServiceDefault.java | 2 +-
.../publish/PublisherDispatchServiceDefault.java | 2 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../sessmgmt/SessionManagementServiceDefault.java | 4 ++--
.../runtimeservices/wrapper/AsyncWrapDefault.java | 4 ++--
.../wrapper/WrapperFactoryDefault.java | 2 +-
.../xactn/TransactionServiceSpring.java | 4 ++--
.../changes/PreAndPostValues_shouldAudit_Test.java | 4 ++--
.../org/apache/isis/webapp/IsisModuleWebapp.java | 2 +-
.../webapp/context/IsisWebAppCommonContext.java | 2 +-
.../secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 2 +-
.../jee_support/IsisCDIBeanScanInterceptor.java | 2 +-
.../services/javax.enterprise.inject.spi.Extension | 2 +-
.../datanucleus5/IsisModuleJdoDataNucleus5.java | 2 +-
.../datanucleus/DataNucleusLifeCycleHelper.java | 2 +-
.../commands/DataNucleusCreateObjectCommand.java | 2 +-
.../service/JdoPersistenceLifecycleService.java | 10 ++++-----
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 2 +-
.../JdoStoreLifecycleListenerForIsis.java | 6 +++---
.../JdoPersistenceCapableFacetAbstract.java | 2 +-
.../metrics/MetricsServiceDefault.java | 2 +-
.../objectadapter/ObjectAdapterContext.java | 4 ++--
.../ObjectAdapterContext_DependencyInjection.java | 2 +-
.../ObjectAdapterContext_Factories.java | 4 ++--
...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 | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 24 +++++++++++-----------
.../persistence/IsisTransactionJdo.java | 8 ++++----
.../persistence/IsisTransactionManagerJdo.java | 6 +++---
.../persistence/PersistenceSessionFactory5.java | 4 ++--
.../adapterfactory/pojo/PojoAdapterTest.java | 4 ++--
.../transaction/PojoAdapterBuilder.java | 4 ++--
.../runtime/system/ObjectMemberAbstractTest.java | 9 ++++----
.../WrapperFactoryDefault_wrappedObject_Test.java | 2 +-
...actoryDefault_wrappedObject_transient_Test.java | 2 +-
.../excel/applib/dom/util/ExcelServiceImpl.java | 4 ++--
.../applib/ExceptionRecognizerTranslate.java | 2 +-
.../applib/IsisIntegrationTestAbstract.java | 2 +-
.../sse/ui/services/SseServiceDefault.java | 4 ++--
.../IsisModuleRestfulObjectsRendering.java | 2 +-
.../viewer/context/ResourceContext.java | 2 +-
.../viewer/resources/ResourceAbstract.java | 4 ++--
.../viewer/resources/SwaggerSpecResource.java | 2 +-
.../webmodule/IsisRestfulObjectsSessionFilter.java | 3 +--
..._ensureCompatibleAcceptHeader_ContractTest.java | 6 +++---
.../context/ResourceContext_getArg_Test.java | 6 +++---
.../ajaxtable/PrototypingMessageProvider.java | 2 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 2 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 2 +-
.../components/scalars/primitive/BooleanPanel.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 | 4 ++--
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...uthenticatedWebSessionForIsis_TestAbstract.java | 2 +-
139 files changed, 225 insertions(+), 229 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
similarity index 68%
rename from core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
index 0e4e32d..5f6c635 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
@@ -16,20 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime;
+package org.apache.isis.core.runtime;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.metamodel.IsisModuleMetamodel;
-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;
+import org.apache.isis.core.runtime.context.session.RuntimeEventService;
+import org.apache.isis.core.runtime.context.session.RuntimeEventSupport_Spring;
+import org.apache.isis.core.runtime.persistence.session.events.PersistenceEventService;
+import org.apache.isis.core.runtime.persistence.session.events.PersistenceEventService_Spring;
+import org.apache.isis.core.runtime.persistence.session.events.TimestampService;
+import org.apache.isis.core.runtime.persistence.transaction.AuditerDispatchService;
+import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
@Configuration
@Import({
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
index d1797e5..455e914 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context;
+package org.apache.isis.core.runtime.context;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -24,9 +24,9 @@ import java.util.function.Supplier;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-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.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/AppLifecycleEvent.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/AppLifecycleEvent.java
index b60078c..afc19ad 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/AppLifecycleEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import lombok.Getter;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
index e14ecb0..68b742d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.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/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
index b719d6f..e7c3b34 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import java.util.function.Supplier;
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.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/context/session/RuntimeEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventService.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventService.java
index f3f5f18..f6c9f21 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import javax.inject.Inject;
import javax.inject.Named;
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
/**
*
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventSupport_Spring.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventSupport_Spring.java
index fe51944..b72fd7b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventSupport_Spring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import javax.enterprise.event.Event;
import javax.inject.Named;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/SessionLifecycleEvent.java
similarity index 91%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/SessionLifecycleEvent.java
index afe76f4..06435f3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/SessionLifecycleEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import lombok.Getter;
import lombok.ToString;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
index 3c8437d..14b8134 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.adapter;
+package org.apache.isis.core.runtime.persistence.adapter;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
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/core/runtime/persistence/adapter/PojoAdapter.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 1d6d486..27bb912 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.adapter;
+package org.apache.isis.core.runtime.persistence.adapter;
import java.io.Serializable;
import java.util.Objects;
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.commons.ToString;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
index 070f45a..4bc5c02 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session;
+package org.apache.isis.core.runtime.persistence.session;
import java.util.List;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
index 9e2acaa..84200a2 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session;
+package org.apache.isis.core.runtime.persistence.session;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService.java
index 2bd1dfd..78cbc78 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import javax.enterprise.event.Event;
import javax.inject.Inject;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService_Spring.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService_Spring.java
index 8a0a5ab..f347311 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/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.persistence.session.events;
+package org.apache.isis.core.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/persistence/session/events/PostStoreEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PostStoreEvent.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PostStoreEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PostStoreEvent.java
index 9319aa9..a883dad 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PostStoreEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PostStoreEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PreStoreEvent.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PreStoreEvent.java
index 70f36f8..e523748 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PreStoreEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/TimestampService.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/TimestampService.java
index c1f62ed..15b84be 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/TimestampService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
index 4b5cdf6..0f70227 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
index 975bb8c..b03767d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.List;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
similarity index 99%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
index 6e8a0eb..6ff275d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.Collections;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionAspectSupport.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionAspectSupport.java
index a317dbd..cbdb9a4 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionAspectSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.Optional;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionFlushException.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionFlushException.java
index 87dac67..7c58f4a 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionFlushException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionManagerException.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionManagerException.java
index bdcc1d7..daaa739 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionManagerException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
index 82fabc3..a94ef72 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.concurrent.CountDownLatch;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionPlaceholder.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionPlaceholder.java
index 7d31ea4..2fb3081 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionPlaceholder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
/**
*
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/PreAndPostValues.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/PreAndPostValues.java
index 6022a32..4012167 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/PreAndPostValues.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.Map;
import java.util.Objects;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
index 3585252..42ffcf9 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionAfterBeginEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
index c60a448..314c03c 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionAfterCommitEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
index 5aef274..672ed01 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionAfterRollbackEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
index 738a2e3..bfadb72 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionBeforeBeginEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
index 871f2b1..575bf1b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionBeforeCommitEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
index 24e17c0..425a295 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionBeforeRollbackEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionEventAbstract.java
similarity index 91%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionEventAbstract.java
index ae1d15b..bd1d62b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionEventAbstract.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
import java.util.EventObject;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
import lombok.Getter;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
index 98bde3b..535a6e6 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.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/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
index 230e4bb..1f4fd96 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
import java.util.Optional;
@@ -26,9 +26,9 @@ import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.commons.ToString;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-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.core.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.core.runtime.context.session.RuntimeEventService;
+import org.apache.isis.core.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/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
index 01fb3e5..e27f672 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
import java.util.concurrent.Callable;
import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.runtime.session.init.InitialisationSession;
+import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
index 5c3a074..378e729 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
import java.io.File;
import java.util.Set;
@@ -45,9 +45,9 @@ import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-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.core.runtime.context.session.RuntimeEventService;
+import org.apache.isis.core.runtime.session.init.IsisLocaleInitializer;
+import org.apache.isis.core.runtime.session.init.IsisTimeZoneInitializer;
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/session/SessionFactoryException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/SessionFactoryException.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/SessionFactoryException.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/SessionFactoryException.java
index e6aa9bd..24985ef 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/SessionFactoryException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/SessionFactoryException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
public class SessionFactoryException extends Exception {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
index 0ef81aa..3f04fc4 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session.init;
+package org.apache.isis.core.runtime.session.init;
import java.io.IOException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisLocaleInitializer.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisLocaleInitializer.java
index 310de6b..694eeb3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisLocaleInitializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session.init;
+package org.apache.isis.core.runtime.session.init;
import java.util.Locale;
import java.util.Optional;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisTimeZoneInitializer.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisTimeZoneInitializer.java
index 6d18158..0ad0960 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisTimeZoneInitializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session.init;
+package org.apache.isis.core.runtime.session.init;
import java.util.TimeZone;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
similarity index 91%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
index 6defee3..b6ffe3a 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.session.template;
+package org.apache.isis.core.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.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.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.session.IsisSession session},
+ * This method is called within a current {@link 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/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
index 906bc74..00e2ca3 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.adapterfactory.pojo;
+package org.apache.isis.core.runtime.persistence.adapterfactory.pojo;
public class RuntimeTestPojo {
private static int nextId;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
index 3e51c47..4b31145 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public interface Interface1 {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
index 7dc4aa9..7080ee8 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class JavaActionTestObject {
private boolean actionCalled = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
index 656ac6e..acce270 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
index 480708c..c47e15d 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class JavaObjectWithOneToOneAssociations {
boolean available = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
similarity index 96%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
index 2f06185..696458f 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class JavaReferencedObject {
private static int next;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index 0ceb3dd..cf55824 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index 05fde56..e3109e2 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
index 50d5cda..e542b1d 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class RuntimeTestPojo {
private static int nextId;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
index 59a3f54..6ac2004 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class TestDomainObject {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
index ad75c93..9d20f20 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class TestObject {
}
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
index e211d13..05896f7 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
// import org.apache.isis.applib.Aggregated;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
index 17e7b67..05d0667 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class TestObjectAsService {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
index 3f5921f..28bbbc0 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import java.util.Vector;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
similarity index 87%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
index 2e1fc55..3f8f76b 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import java.lang.reflect.Method;
import java.util.List;
@@ -30,8 +30,6 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.specloader.traverser.TypeExtractorMethodReturn;
-import static org.apache.isis.runtime.system.TypeExtractorMethodsParametersTest.containsElementThat;
-
public class TypeExtractorMethodReturnTest {
@Test
@@ -53,8 +51,8 @@ public class TypeExtractorMethodReturnTest {
final List<Class<?>> classes = extractor.getClasses();
assertThat(classes.size(), is(2));
- assertThat(classes, containsElementThat(equalTo((Class<?>)java.util.List.class)));
- assertThat(classes, containsElementThat(equalTo((Class<?>)Customer.class)));
+ assertThat(classes, TypeExtractorMethodsParametersTest.containsElementThat(equalTo((Class<?>)java.util.List.class)));
+ assertThat(classes, TypeExtractorMethodsParametersTest.containsElementThat(equalTo((Class<?>)Customer.class)));
}
@Test
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
index 1b9694c..5c3c994 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
similarity index 92%
rename from core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
index 24e2c6b..34e14d8 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.systemusinginstallers.fixture.budget;
+package org.apache.isis.core.runtime.systemusinginstallers.fixture.budget;
public class SomeServiceToInclude {
}
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
similarity index 91%
rename from core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
index 7fec8ee..c17e740 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.systemusinginstallers.fixture.budgetassignment;
+package org.apache.isis.core.runtime.systemusinginstallers.fixture.budgetassignment;
public class SomeServiceNotToInclude {
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index 9aa1f11..c7cdcbe 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
-import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleRuntime;
import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
import org.apache.isis.runtimeservices.command.CommandDtoServiceInternalDefault;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
index d0d4d7f..64ded5d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
@@ -28,8 +28,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.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/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
index dfe64eb..15ffeb0 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/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.session.template.AbstractIsisSessionTemplate;
+import org.apache.isis.core.runtime.session.template.AbstractIsisSessionTemplate;
/**
*/
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
index 985ab7a..8795977 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -57,9 +57,9 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-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.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.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/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
index dc7a108..0bd2811 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
index 181ca15..887ddff 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.MessageBroker;
@Service
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
index ec458ca..6758cf5 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
@@ -50,7 +50,7 @@ import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
import org.apache.isis.core.metamodel.services.publishing.PublisherDispatchService;
-import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
/**
* Wrapper around {@link PublisherService}. Is a no-op if there is no injected service.
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
index e426396..e0b19ed 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.val;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
index 27356bc..b667ccf 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
@@ -29,8 +29,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.val;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
index e94d599..6e96995 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/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.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
index f59c470..a1e4c13 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -68,7 +68,7 @@ import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispa
import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
import org.apache.isis.runtimeservices.wrapper.handlers.ProxyContextHandler;
import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
index aacc68a..55a1873 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/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.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
index 779b6c7..0608a8a 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
@@ -23,8 +23,8 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionPlaceholder;
-import org.apache.isis.runtime.persistence.transaction.PreAndPostValues;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionPlaceholder;
+import org.apache.isis.core.runtime.persistence.transaction.PreAndPostValues;
public class PreAndPostValues_shouldAudit_Test {
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
index d2aebed..1ac3dec 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
@@ -21,7 +21,7 @@ package org.apache.isis.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleRuntime;
import org.apache.isis.webapp.health.HealthIndicatorUsingHealthCheckService;
import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
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 d2d2df2..54e1b94 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.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.webapp.context.memento.ObjectMemento;
import org.apache.isis.webapp.context.memento.ObjectMementoService;
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 a2fa6f7..0a4ad86 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
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.runtime.context.session.AppLifecycleEvent;
+import org.apache.isis.core.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 ca65bc0..7135598 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
@@ -46,7 +46,7 @@ import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionServic
import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authorization.standard.Authorizor;
import lombok.Getter;
diff --git a/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
similarity index 98%
rename from incubator/extensions/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
rename to incubator/extensions/core/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
index 5d2fe5c..82f55e9 100644
--- a/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
+++ b/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.jee_support;
+package org.apache.isis.core.runtime.jee_support;
import java.util.List;
import java.util.function.Predicate;
diff --git a/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index 9e45182..2f1450f 100644
--- a/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1 +1 @@
-org.apache.isis.runtime.jee_support.IsisCDIBeanScanInterceptor
\ No newline at end of file
+org.apache.isis.core.runtime.jee_support.IsisCDIBeanScanInterceptor
\ No newline at end of file
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
index 4bc18fc..9aecb35 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
@@ -39,7 +39,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoProgrammingMode
import org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessionFactory5;
-import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleRuntime;
@Configuration
@Import({
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
index f8fb935..deee65e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
+++ b/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.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
/**
*
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
index b0a18d2..66e22b6 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
+++ b/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.core.metamodel.spec.ManagedObject;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index d76ca5e..11c3c69 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++ b/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.core.commons.internal.context._Context;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-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 org.apache.isis.core.runtime.context.session.AppLifecycleEvent;
+import org.apache.isis.core.runtime.context.session.SessionLifecycleEvent;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
index d3c43c6..947235c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
@@ -48,7 +48,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.ObjectPersistenceException;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
index 03e4a81..b48b386 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
+++ b/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.persistence.session.events.PersistenceEventService;
-import org.apache.isis.runtime.persistence.session.events.PostStoreEvent;
-import org.apache.isis.runtime.persistence.session.events.PreStoreEvent;
+import org.apache.isis.core.runtime.persistence.session.events.PersistenceEventService;
+import org.apache.isis.core.runtime.persistence.session.events.PostStoreEvent;
+import org.apache.isis.core.runtime.persistence.session.events.PreStoreEvent;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
index 716558b..d93037e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
public abstract class JdoPersistenceCapableFacetAbstract
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
index 69ec3c0..fe801a4 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Service;
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.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
@Service
@Named("isisJdoDn5.MetricsServiceDefault")
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index 896ad3e..ceec585 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -38,8 +38,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
-import org.apache.isis.runtime.context.session.RuntimeContextBase;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
index a50730b..4e4e59c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
+++ b/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.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
index 290c92b..6cbd5be 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
@@ -25,8 +25,8 @@ import org.apache.isis.core.metamodel.adapter.oid.ParentedOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.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.session.IsisSession;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.session.IsisSession;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
index 48edabb..3af6a7e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
+++ b/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.core.commons.internal.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facets.object.callbacks.LifecycleEventFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
index 938504e..86fb27c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
+++ b/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.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.RequiredArgsConstructor;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
index 2eb88d7..f830ce3 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
+++ b/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.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.session.RuntimeContext;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
index 80037c3..9f8eba2 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/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.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
index 0f90d4d..3d09d08 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
+++ b/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.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
index 16d9b08..08c6de9 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
@@ -45,7 +45,7 @@ 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.core.runtime.context.IsisContext;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
index 4f369e2..e3e4aad 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.PersistenceCommand;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
/**
*
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 76df67c..178092e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFactory;
-import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 3e788bd..5f8cf5a 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -33,18 +33,18 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-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.persistence.transaction.events.TransactionAfterBeginEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionAfterCommitEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionAfterRollbackEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionBeforeBeginEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionBeforeCommitEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionBeforeRollbackEvent;
-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.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAfterBeginEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAfterCommitEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAfterRollbackEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeBeginEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeCommitEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeRollbackEvent;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
index 3b5de8c..fc4d474 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
@@ -38,10 +38,10 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.DestroyObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.PersistenceCommand;
-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 org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.transaction.AuditerDispatchService;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionFlushException;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionManagerException;
import lombok.Getter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
index 05a48da..a40dc28 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
@@ -28,9 +28,9 @@ import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.PersistenceCommand;
-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 org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionManagerException;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
import lombok.Getter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index 1f3042e..50792b4 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -49,8 +49,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.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.persistence.session.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
similarity index 95%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index f8e6806..d333fb6 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.adapterfactory.pojo;
+package org.apache.isis.core.runtime.persistence.adapterfactory.pojo;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
similarity index 97%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index f89f096..4f2ee90 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.objectstore.transaction;
+package org.apache.isis.core.runtime.persistence.objectstore.transaction;
import java.util.Iterator;
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
similarity index 96%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index e0fe99f..70ecc46 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import org.datanucleus.enhancement.Persistable;
import org.jmock.Expectations;
@@ -60,9 +60,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -107,7 +106,7 @@ public class ObjectMemberAbstractTest {
transientAdapter = PojoAdapterBuilder.create()
.with(mockSpecificationLoader)
- .with(Persistence.TRANSIENT)
+ .with(PojoAdapterBuilder.Persistence.TRANSIENT)
.withPojo(mockPersistable)
.build();
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 4e72ec7..e36b32d 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -69,7 +69,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificati
import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepository;
import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.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/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 8c8ef95..435d911 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -64,7 +64,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.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/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
index 0b55d9e..f7d942f 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
@@ -22,8 +22,8 @@ import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.session.RuntimeContextBase;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.core.runtime.session.IsisSession;
import lombok.SneakyThrows;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
index e2aa4ee..ca0cab8 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.RequiredArgsConstructor;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
index 4e51396..3824dbc 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionAfterBeginEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAfterBeginEvent;
/**
* Convenient base class to extend for integration tests.
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
index c196f8e..eede37a 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
@@ -45,8 +45,8 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
import org.apache.isis.valuetypes.sse.applib.service.SseService;
import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
index 2ed2bb3..51b0874 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.restfulobjects.rendering;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleRuntime;
import org.apache.isis.viewer.restfulobjects.applib.IsisModuleRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceContentNegotiator;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
index 4901b65..f779c48 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.core.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.RestfulRequest.DomainModel;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 983bafd..acd9b08 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
index 9e0d3d4..edf02f2 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
@@ -34,7 +34,7 @@ import javax.ws.rs.core.MediaType;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
index d0575e4..90601c0 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
@@ -29,7 +29,6 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -47,7 +46,7 @@ import org.apache.isis.core.commons.internal.factory.InstanceUtil;
import org.apache.isis.core.metamodel.commons.StringExtensions;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategy;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyDefault;
import org.apache.isis.webapp.modules.templresources.TemplateResourceCachingFilter;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index d0667cc..e7dc74f 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -42,9 +42,9 @@ import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-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.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.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/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 4a1dd3f..f647b22 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -40,9 +40,9 @@ import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-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.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.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/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index bfef163..223537c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/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.core.commons.internal.base._Timing;
import org.apache.isis.core.commons.internal.base._Timing.StopWatch;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
/**
* Responsibility: produce additional info when in prototyping mode
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 355d72a..eaa2c2f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.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/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 213d598..054824c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.NamedWithMimeType;
import org.apache.isis.core.metamodel.commons.CloseableExtensions;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index e5ec4bb..99cb443 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -31,7 +31,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index ce1659d..d1feac7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/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.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.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/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index 6d94010..12394ee 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/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.core.config.IsisConfiguration;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index d11baac..16c093e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/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.core.config.viewer.wicket.WebAppConfiguration;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 0d485ac..97a7200 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index eafcd9e..9040699 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index e850300..9cdbe0e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/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.session.IsisSessionFactory;
+import org.apache.isis.core.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/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
index 4dd6e16..a8e3f54 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
+++ b/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.session.IsisSession;
+import org.apache.isis.core.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/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 42541fe..258bac2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/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.core.commons.collections.Can;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 1a8f9f3..f63422b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -48,8 +48,8 @@ import org.apache.isis.core.metamodel.facets.actions.redirect.RedirectFacet;
import org.apache.isis.core.metamodel.facets.properties.renderunchanged.UnchangingFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisRequestCycle;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisRequestCycle;
+import org.apache.isis.core.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/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 4c1a3fe..995c50a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.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/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index be11165..60a8662 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -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.session.IsisSessionFactory;
+import org.apache.isis.core.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/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
index 3bd9c1c..6c0cfc2 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
+++ b/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.core.commons.internal.base._Strings;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
/**
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 60f60fa..816edf4 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -52,10 +52,10 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-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.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.session.IsisRequestCycle;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.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/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
index fd94e09..5f22e6d 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.session.IsisSession;
import static org.apache.isis.core.commons.internal.functions._Predicates.not;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 52df0fd..c46b029 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.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.manager.AuthenticationManager;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index d808615..8925bee 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.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.manager.AuthenticationManager;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index 54de880..4b68189 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/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.session.IsisSessionFactory;
+import org.apache.isis.core.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;