You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/03 08:36:43 UTC

[isis] branch 2033-Spring_Data_Integration updated: ISIS-2033: jdo-integration: cleanup and further simplify

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

ahuber pushed a commit to branch 2033-Spring_Data_Integration
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/2033-Spring_Data_Integration by this push:
     new 35a29d7  ISIS-2033: jdo-integration: cleanup and further simplify
35a29d7 is described below

commit 35a29d733195978f1be40d03ef28b8fa7c881f70
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 3 09:36:26 2021 +0100

    ISIS-2033: jdo-integration: cleanup and further simplify
---
 .../isis/commons/internal/assertions/_Assert.java  | 28 +++++++
 .../events/InteractionLifecycleEvent.java          | 39 ---------
 .../interaction/scope}/InteractionScopeAware.java  | 12 +--
 .../interaction/session/InteractionSession.java    |  8 +-
 .../isis/core/runtime/IsisModuleCoreRuntime.java   |  2 +
 .../runtime/events/AppLifecycleEventService.java   | 31 +------
 .../runtime}/events/TransactionEventEmitter.java   | 11 ++-
 .../session/InteractionFactoryDefault.java         | 12 ++-
 .../transaction/IsisModuleCoreTransaction.java     |  2 -
 .../viewer/javafx/ui/main/UiBuilderFx.java         | 34 ++++----
 .../jdo/integration/IsisModuleJdoIntegration.java  |  4 +-
 .../integration/jdosupport/IsisJdoSupportDN5.java  |  2 +-
 .../lifecycles/DataNucleusLifeCycleHelper.java     | 59 --------------
 ...ycleListener.java => JdoLifecycleListener.java} | 41 ++++++++--
 .../JdoStoreLifecycleListenerForIsis.java          | 70 ----------------
 .../lifecycles/LoadLifecycleListenerForIsis.java   | 46 -----------
 .../jdo/integration/lifecycles/_Utils.java         |  2 -
 .../persistence/JdoPersistenceSession.java         | 41 ----------
 .../{persistence => session}/DnApplication.java    |  2 +-
 .../JdoEntityChangeEmitter.java                    |  6 +-
 .../JdoFetchResultHandler.java                     |  2 +-
 .../JdoIntegrationService.java}                    | 62 +++++---------
 .../JdoInteractionSession.java}                    | 94 ++++++++--------------
 .../_DnApplicationComponents.java                  | 19 ++++-
 .../_DnStoreManagerType.java                       |  2 +-
 .../{persistence => session}/_Utils.java           |  2 +-
 .../testdomain/conf/Configuration_headless.java    | 36 ++++-----
 .../util/interaction/InteractionBoundaryProbe.java | 28 ++-----
 28 files changed, 210 insertions(+), 487 deletions(-)

diff --git a/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java b/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
index e82fd31..cd62777 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
@@ -22,6 +22,8 @@ package org.apache.isis.commons.internal.assertions;
 import java.util.Objects;
 import java.util.function.Supplier;
 
+import javax.annotation.Nullable;
+
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.commons.internal.primitives._Ints;
@@ -183,6 +185,32 @@ public final class _Assert {
                     "unexpected type: <%s> is not an instance of <%s> ", ""+type, ""+requiredType));
         }
     }
+    
+    // -- OPEN/CLOSE STATE
+
+    public enum OpenCloseState {
+
+        NOT_INITIALIZED, 
+        OPEN, 
+        CLOSED
+        ;
+
+        public boolean isNotInitialized() { return this == NOT_INITIALIZED; }
+        public boolean isOpen() { return this == OPEN; }
+        public boolean isClosed() { return this == CLOSED; }
+        
+        /**
+         * @param expected - nullable
+         * @throws IllegalArgumentException if {@code this} not equal to {@code expected} 
+         */
+        public void assertEquals(
+                final @Nullable OpenCloseState expected) {
+            if (expected != this) {
+                throw new IllegalStateException("State is: " + this + "; should be: " + expected);    
+            }
+        }
+        
+    }
 
     // -- HELPER
 
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/events/InteractionLifecycleEvent.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/events/InteractionLifecycleEvent.java
deleted file mode 100644
index b98a7d5..0000000
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/events/InteractionLifecycleEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.core.interaction.events;
-
-import org.apache.isis.core.interaction.session.InteractionSession;
-
-import lombok.Getter;
-import lombok.ToString;
-import lombok.Value;
-
-@Value(staticConstructor="of") @ToString(of = "eventType")
-public class InteractionLifecycleEvent {
-
-    public enum EventType {
-        HAS_STARTED,
-        IS_ENDING,
-    }
-
-    @Getter String conversationId;
-    @Getter InteractionSession interactionSession;
-    @Getter EventType eventType;
-
-}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/interaction/InteractionScopeAware.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/InteractionScopeAware.java
similarity index 63%
rename from api/applib/src/main/java/org/apache/isis/applib/interaction/InteractionScopeAware.java
rename to core/interaction/src/main/java/org/apache/isis/core/interaction/scope/InteractionScopeAware.java
index 0549029..c9d336d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/interaction/InteractionScopeAware.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/InteractionScopeAware.java
@@ -16,23 +16,25 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.applib.interaction;
+package org.apache.isis.core.interaction.scope;
+
+import org.apache.isis.core.interaction.session.InteractionSession;
 
 public interface InteractionScopeAware {
 
-    default void beforeEnteringTransactionalBoundary() {
+    default void beforeEnteringTransactionalBoundary(InteractionSession interactionSession) {
         
     }
     
-    default void afterEnteringTransactionalBoundary(boolean isSynchronizationActive) {
+    default void afterEnteringTransactionalBoundary(InteractionSession interactionSession, boolean isSynchronizationActive) {
         
     }
     
-    default void beforeLeavingTransactionalBoundary(boolean isSynchronizationActive) {
+    default void beforeLeavingTransactionalBoundary(InteractionSession interactionSession, boolean isSynchronizationActive) {
         
     }
     
-    default void afterLeavingTransactionalBoundary() {
+    default void afterLeavingTransactionalBoundary(InteractionSession interactionSession) {
         
     }
     
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionSession.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionSession.java
index 391b2f2..43d6aca 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionSession.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionSession.java
@@ -25,6 +25,7 @@ import java.util.UUID;
 import java.util.function.Function;
 
 import org.apache.isis.applib.services.iactn.Interaction;
+import org.apache.isis.commons.having.HasUniqueId;
 import org.apache.isis.commons.internal.base._Casts;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.metamodel.commons.ToString;
@@ -49,7 +50,8 @@ import lombok.Setter;
  *
  * @see InteractionFactory
  */
-public class InteractionSession {
+public class InteractionSession
+implements HasUniqueId {
 
     @Getter private final long startedAtSystemNanos;
     
@@ -152,6 +154,10 @@ public class InteractionSession {
                 : attributes;
     }
     
+    @Override
+    public UUID getUniqueId() {
+        return getInteraction().getUniqueId();
+    }
     
     // -- TO STRING
     
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
index 673271d..4eeceb9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
@@ -24,6 +24,7 @@ import org.springframework.context.annotation.Import;
 import org.apache.isis.core.interaction.IsisModuleCoreInteraction;
 import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
 import org.apache.isis.core.runtime.events.AppLifecycleEventService;
+import org.apache.isis.core.runtime.events.TransactionEventEmitter;
 import org.apache.isis.core.transaction.IsisModuleCoreTransaction;
 
 @Configuration
@@ -35,6 +36,7 @@ import org.apache.isis.core.transaction.IsisModuleCoreTransaction;
 
         // @Service's
         AppLifecycleEventService.class,
+        TransactionEventEmitter.class,
 
         // @Configuration's
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/AppLifecycleEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/AppLifecycleEventService.java
index 688e7b7..090c703 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/AppLifecycleEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/AppLifecycleEventService.java
@@ -28,15 +28,9 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.commons.internal.debug._Probe;
-import org.apache.isis.core.interaction.events.InteractionLifecycleEvent;
-import org.apache.isis.core.interaction.session.InteractionSession;
-import org.apache.isis.core.interaction.session.InteractionTracker;
 import org.apache.isis.core.transaction.changetracking.events.PostStoreEvent;
 import org.apache.isis.core.transaction.changetracking.events.PreStoreEvent;
 
-import lombok.val;
-
 /**
  * 
  * @since 2.0
@@ -44,14 +38,13 @@ import lombok.val;
  * post-construct phase has finished and before the pre-destroy phase has begun.
  */
 @Service
-@Named("isisRuntime.RuntimeEventService")
+@Named("isisRuntime.AppLifecycleEventService")
 @Order(OrderPrecedence.MIDPOINT)
 @Primary
 @Qualifier("Default")
 public class AppLifecycleEventService {
     
     @Inject private EventBusService eventBusService;
-    @Inject private InteractionTracker interactionTracker;
 
    // -- APP
 
@@ -63,28 +56,6 @@ public class AppLifecycleEventService {
         eventBusService.post(AppLifecycleEvent.POST_METAMODEL);
     }
 
-    // -- INTERACTION
-
-    public void fireInteractionHasStarted(InteractionSession interactionSession) {
-        
-        _Probe.errOut("fireInteractionHasStarted");
-        
-        val conversationId = interactionTracker.getConversationId().orElse(null);
-        eventBusService.post(
-                InteractionLifecycleEvent
-                .of(conversationId, interactionSession, InteractionLifecycleEvent.EventType.HAS_STARTED));
-    }
-
-    public void fireInteractionIsEnding(InteractionSession interactionSession) {
-        
-        _Probe.errOut("fireInteractionIsEnding");
-        
-        val conversationId = interactionTracker.getConversationId().orElse(null);
-        eventBusService.post(
-                InteractionLifecycleEvent
-                .of(conversationId, interactionSession, InteractionLifecycleEvent.EventType.IS_ENDING));
-    }
-	
     // -- PERSISTENT OBJECT EVENTS
 
     public void firePreStoreEvent(Object persistableObject) {
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/events/TransactionEventEmitter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/TransactionEventEmitter.java
similarity index 78%
rename from core/transaction/src/main/java/org/apache/isis/core/transaction/events/TransactionEventEmitter.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/events/TransactionEventEmitter.java
index dc81cee..50b9a6a 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/events/TransactionEventEmitter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/TransactionEventEmitter.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.transaction.events;
+package org.apache.isis.core.runtime.events;
 
 import javax.inject.Inject;
 
@@ -24,8 +24,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
-import org.apache.isis.applib.interaction.InteractionScopeAware;
 import org.apache.isis.applib.services.eventbus.EventBusService;
+import org.apache.isis.core.interaction.scope.InteractionScopeAware;
+import org.apache.isis.core.interaction.session.InteractionSession;
+import org.apache.isis.core.transaction.events.TransactionAfterCompletionEvent;
+import org.apache.isis.core.transaction.events.TransactionBeforeCompletionEvent;
 
 import lombok.RequiredArgsConstructor;
 
@@ -47,7 +50,9 @@ implements TransactionSynchronization, InteractionScopeAware {
     }
     
     @Override
-    public void afterEnteringTransactionalBoundary(boolean isSynchronizationActive) {
+    public void afterEnteringTransactionalBoundary(
+            InteractionSession interactionSession, 
+            boolean isSynchronizationActive) {
         if(isSynchronizationActive) {
             TransactionSynchronizationManager.registerSynchronization(this);
         }
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
index 7ac9bb2..74e0704 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
@@ -43,7 +43,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.interaction.InteractionScopeAware;
 import org.apache.isis.applib.services.clock.ClockService;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.util.schema.ChangesDtoUtils;
@@ -56,6 +55,7 @@ import org.apache.isis.commons.internal.debug._Probe;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.core.interaction.integration.InteractionAwareTransactionalBoundaryHandler;
+import org.apache.isis.core.interaction.scope.InteractionScopeAware;
 import org.apache.isis.core.interaction.scope.InteractionScopeBeanFactoryPostProcessor;
 import org.apache.isis.core.interaction.scope.InteractionScopeLifecycleHandler;
 import org.apache.isis.core.interaction.session.AuthenticationLayer;
@@ -308,22 +308,20 @@ implements InteractionFactory, InteractionTracker {
     
     private void postSessionOpened(InteractionSession session) {
         conversationId.set(UUID.randomUUID());
-        interactionScopeAwareBeans.forEach(InteractionScopeAware::beforeEnteringTransactionalBoundary);
+        interactionScopeAwareBeans.forEach(bean->bean.beforeEnteringTransactionalBoundary(session));
         txBoundaryHandler.onOpen(session);
         val isSynchronizationActive = TransactionSynchronizationManager.isSynchronizationActive();
-        interactionScopeAwareBeans.forEach(bean->bean.afterEnteringTransactionalBoundary(isSynchronizationActive));
+        interactionScopeAwareBeans.forEach(bean->bean.afterEnteringTransactionalBoundary(session, isSynchronizationActive));
         interactionScopeLifecycleHandler.onTopLevelInteractionOpened();
-        runtimeEventService.fireInteractionHasStarted(session); // only fire on top-level session
     }
     
     private void preSessionClosed(InteractionSession session) {
         completeAndPublishCurrentCommand();
-        runtimeEventService.fireInteractionIsEnding(session); // only fire on top-level session 
         interactionScopeLifecycleHandler.onTopLevelInteractionClosing(); // cleanup the isis-session scope
         val isSynchronizationActive = TransactionSynchronizationManager.isSynchronizationActive();
-        interactionScopeAwareBeans.forEach(bean->bean.beforeLeavingTransactionalBoundary(isSynchronizationActive));
+        interactionScopeAwareBeans.forEach(bean->bean.beforeLeavingTransactionalBoundary(session, isSynchronizationActive));
         txBoundaryHandler.onClose(session);
-        interactionScopeAwareBeans.forEach(InteractionScopeAware::afterLeavingTransactionalBoundary);
+        interactionScopeAwareBeans.forEach(bean->bean.afterLeavingTransactionalBoundary(session));
         session.close(); // do this last
     }
     
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/IsisModuleCoreTransaction.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/IsisModuleCoreTransaction.java
index e4a89d6..d19577d 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/IsisModuleCoreTransaction.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/IsisModuleCoreTransaction.java
@@ -23,13 +23,11 @@ import org.springframework.context.annotation.Import;
 
 import org.apache.isis.core.transaction.changetracking.EntityChangeTrackerDefault;
 import org.apache.isis.core.transaction.changetracking.events.TimestampService;
-import org.apache.isis.core.transaction.events.TransactionEventEmitter;
 
 @Configuration
 @Import({
         // @Service's
         TimestampService.class,
-        TransactionEventEmitter.class,
         EntityChangeTrackerDefault.class,
 })
 public class IsisModuleCoreTransaction {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java
index dfa8626..41ddab9 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilderFx.java
@@ -27,7 +27,8 @@ import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 import org.apache.isis.commons.internal.debug._Probe;
-import org.apache.isis.core.interaction.events.InteractionLifecycleEvent;
+import org.apache.isis.core.interaction.scope.InteractionScopeAware;
+import org.apache.isis.core.interaction.session.InteractionSession;
 import org.apache.isis.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
 import org.apache.isis.incubator.viewer.javafx.model.events.PrimaryStageReadyEvent;
 
@@ -43,7 +44,7 @@ import lombok.extern.log4j.Log4j2;
 @Component
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 @Log4j2
-public class UiBuilderFx {
+public class UiBuilderFx implements InteractionScopeAware {
     
     private final ApplicationContext springContext;
     private final JavaFxViewerConfig viewerConfig;
@@ -65,23 +66,18 @@ public class UiBuilderFx {
         stage.show();
     }
 
-    @EventListener(InteractionLifecycleEvent.class)
-    public void onInteractionLifecycleEvent(InteractionLifecycleEvent event) {
-        switch(event.getEventType()) {
-        case HAS_STARTED:
-            //TODO this would be the place to indicate to the user, that a long running task has started  
-            _Probe.errOut("Interaction HAS_STARTED conversationId=%s", event.getConversationId());
-            //scene.getRoot().cursorProperty().set(Cursor.WAIT);
-            break;
-        case IS_ENDING:
-            //TODO this would be the place to indicate to the user, that a long running task has ended
-            _Probe.errOut("Interaction IS_ENDING conversationId=%s", event.getConversationId());
-            //scene.getRoot().cursorProperty().set(Cursor.DEFAULT);
-            break;
-        default:
-            break;
-        }
-        
+    @Override
+    public void beforeEnteringTransactionalBoundary(InteractionSession interactionSession) {
+        //TODO this would be the place to indicate to the user, that a long running task has started
+        //scene.getRoot().cursorProperty().set(Cursor.WAIT);
+        _Probe.errOut("Interaction HAS_STARTED conversationId=%s", interactionSession.getUniqueId());
+    }
+    
+    @Override
+    public void afterLeavingTransactionalBoundary(InteractionSession interactionSession) {
+        //TODO this would be the place to indicate to the user, that a long running task has ended
+        //scene.getRoot().cursorProperty().set(Cursor.DEFAULT);
+        _Probe.errOut("Interaction IS_ENDING conversationId=%s", interactionSession.getUniqueId());
     }
     
     // -- HELPER
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
index 5680373..41e4a0f 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
@@ -31,8 +31,8 @@ import org.apache.isis.persistence.jdo.applib.IsisModulePersistenceJdoApplib;
 import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoProviderDatanucleus;
 import org.apache.isis.persistence.jdo.datanucleus.config.DnSettings;
 import org.apache.isis.persistence.jdo.integration.jdosupport.IsisJdoSupportDN5;
-import org.apache.isis.persistence.jdo.integration.lifecycles.JdoPersistenceLifecycleService;
 import org.apache.isis.persistence.jdo.integration.metamodel.JdoIntegrationProgrammingModel;
+import org.apache.isis.persistence.jdo.integration.session.JdoIntegrationService;
 import org.apache.isis.persistence.jdo.metamodel.IsisModuleJdoMetamodel;
 import org.apache.isis.persistence.jdo.spring.integration.JdoTransactionManager;
 import org.apache.isis.persistence.jdo.spring.integration.LocalPersistenceManagerFactoryBean;
@@ -52,7 +52,7 @@ import lombok.val;
         JdoIntegrationProgrammingModel.class,
         
         IsisJdoSupportDN5.class,
-        JdoPersistenceLifecycleService.class,
+        JdoIntegrationService.class,
 
 })
 public class IsisModuleJdoIntegration {
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/jdosupport/IsisJdoSupportDN5.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/jdosupport/IsisJdoSupportDN5.java
index c1db806..b5c6f86 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/jdosupport/IsisJdoSupportDN5.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/jdosupport/IsisJdoSupportDN5.java
@@ -60,7 +60,7 @@ import lombok.val;
  *
  */
 @Service
-@Named("isisJdoDn5.IsisJdoSupportDN5")
+@Named("isisJdoIntegration.IsisJdoSupport_v3_2")
 @Order(OrderPrecedence.MIDPOINT)
 @Primary
 @Qualifier("DN5")
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/DataNucleusLifeCycleHelper.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/DataNucleusLifeCycleHelper.java
deleted file mode 100644
index e8b34df..0000000
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/DataNucleusLifeCycleHelper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.persistence.jdo.integration.lifecycles;
-
-import javax.jdo.PersistenceManagerFactory;
-
-import org.datanucleus.enhancer.EnhancementHelper;
-
-import org.apache.isis.commons.internal.context._Context;
-
-/**
- *
- * Purges any state associated with DataNucleus.
- * <p>
- * (requires datanucleus-core 4 or 5 >= 5.1.5)
- *
- * @since 2.0.0
- *
- */
-public class DataNucleusLifeCycleHelper {
-
-    public static void cleanUp(PersistenceManagerFactory persistenceManagerFactory) {
-
-        try {
-
-            final ClassLoader cl = _Context.getDefaultClassLoader();
-
-            persistenceManagerFactory.close();
-
-            // for info, on why we do this see
-            // https://github.com/datanucleus/datanucleus-core/issues/272
-            EnhancementHelper.getInstance().unregisterClasses(cl);
-
-            // cleanup thread locals
-            //JDOStateManagerForIsis.hint.remove();
-
-        } catch (Exception e) {
-            // ignore, since it only affects re-deploy-ability, which is nice to have but not critical
-        }
-
-    }
-
-}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/IsisLifecycleListener.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoLifecycleListener.java
similarity index 84%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/IsisLifecycleListener.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoLifecycleListener.java
index 144474e..69a44b3 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/IsisLifecycleListener.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoLifecycleListener.java
@@ -20,6 +20,7 @@ package org.apache.isis.persistence.jdo.integration.lifecycles;
 
 import java.util.Map;
 
+import javax.enterprise.inject.Vetoed;
 import javax.jdo.listener.AttachLifecycleListener;
 import javax.jdo.listener.ClearLifecycleListener;
 import javax.jdo.listener.CreateLifecycleListener;
@@ -34,10 +35,17 @@ import org.datanucleus.enhancement.Persistable;
 
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.runtime.events.AppLifecycleEventService;
+import org.apache.isis.core.transaction.changetracking.EntityChangeTracker;
+import org.apache.isis.persistence.jdo.integration.metamodel.JdoMetamodelUtil;
 
 import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
 
-public class IsisLifecycleListener
+@Vetoed // managed by isis
+@RequiredArgsConstructor
+public class JdoLifecycleListener
 implements AttachLifecycleListener, ClearLifecycleListener, CreateLifecycleListener, DeleteLifecycleListener,
 DetachLifecycleListener, DirtyLifecycleListener, LoadLifecycleListener, StoreLifecycleListener {
 
@@ -58,12 +66,9 @@ DetachLifecycleListener, DirtyLifecycleListener, LoadLifecycleListener, StoreLif
 
     }
 
-    private final EntityChangeEmitter entityChangeEmitter;
-
-    public IsisLifecycleListener(final @NonNull EntityChangeEmitter entityChangeEmitter) {
-        this.entityChangeEmitter = entityChangeEmitter;
-    }
-
+    private final @NonNull EntityChangeEmitter entityChangeEmitter;
+    private final @NonNull EntityChangeTracker entityChangeTracker;
+    private final @NonNull AppLifecycleEventService appLifecycleEventService;
 
     /////////////////////////////////////////////////////////////////////////
     // callbacks
@@ -90,25 +95,47 @@ DetachLifecycleListener, DirtyLifecycleListener, LoadLifecycleListener, StoreLif
     public void postLoad(final InstanceLifecycleEvent event) {
         final Persistable pojo = _Utils.persistableFor(event);
         entityChangeEmitter.adaptEntityAndInjectServices(pojo);
+        entityChangeTracker.incrementLoaded();
     }
 
     @Override
     public void preStore(InstanceLifecycleEvent event) {
+
+        val persistableObject = event.getPersistentInstance();
+
+        if(persistableObject!=null 
+                && JdoMetamodelUtil.isPersistenceEnhanced(persistableObject.getClass())) {
+
+            appLifecycleEventService.firePreStoreEvent(persistableObject);
+        }
+        
         final Persistable pojo = _Utils.persistableFor(event);
         if(pojo.dnGetStateManager().isNew(pojo)) {
             entityChangeEmitter.invokeIsisPersistingCallback(pojo);
         }
+        
     }
 
     @Override
     public void postStore(InstanceLifecycleEvent event) {
+
+        val persistableObject = event.getPersistentInstance();
+
+        if(persistableObject!=null && 
+                JdoMetamodelUtil.isPersistenceEnhanced(persistableObject.getClass())) {
+
+            appLifecycleEventService.firePostStoreEvent(persistableObject);
+        }
+        
         final Persistable pojo = _Utils.persistableFor(event);
         if(pojo.dnGetStateManager().isNew(pojo)) {
             entityChangeEmitter.enlistCreatedAndInvokeIsisPersistedCallback(pojo);
         } else {
             entityChangeEmitter.invokeIsisUpdatedCallback(pojo);
         }
+        
     }
+    
 
     @Override
     public void preDirty(InstanceLifecycleEvent event) {
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoStoreLifecycleListenerForIsis.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoStoreLifecycleListenerForIsis.java
deleted file mode 100644
index 560f3ab..0000000
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoStoreLifecycleListenerForIsis.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.persistence.jdo.integration.lifecycles;
-
-import javax.enterprise.inject.Vetoed;
-import javax.inject.Inject;
-import javax.jdo.listener.InstanceLifecycleEvent;
-
-import org.apache.isis.core.runtime.events.AppLifecycleEventService;
-import org.apache.isis.persistence.jdo.integration.metamodel.JdoMetamodelUtil;
-
-import lombok.val;
-
-/**
- * To be registered with each JDO PersistenceManager instance, in order to publish
- * persistence related events on the framework's event bus.
- * 
- * @since 2.0
- *
- */
-@Vetoed // managed by isis
-public class JdoStoreLifecycleListenerForIsis 
-implements javax.jdo.listener.StoreLifecycleListener {
-    
-    @Inject private AppLifecycleEventService runtimeEventService;
-
-    @Override
-    public void preStore(InstanceLifecycleEvent instanceEvent) {
-
-        val persistableObject = instanceEvent.getPersistentInstance();
-
-        if(persistableObject!=null 
-                && JdoMetamodelUtil.isPersistenceEnhanced(persistableObject.getClass())) {
-
-            runtimeEventService.firePreStoreEvent(persistableObject);
-        }
-        
-    }
-
-    @Override
-    public void postStore(InstanceLifecycleEvent instanceEvent) {
-
-        val persistableObject = instanceEvent.getPersistentInstance();
-
-        if(persistableObject!=null && 
-                JdoMetamodelUtil.isPersistenceEnhanced(persistableObject.getClass())) {
-
-            runtimeEventService.firePostStoreEvent(persistableObject);
-        }
-        
-    }
-    
-
-}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/LoadLifecycleListenerForIsis.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/LoadLifecycleListenerForIsis.java
deleted file mode 100644
index e4ba823..0000000
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/LoadLifecycleListenerForIsis.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.persistence.jdo.integration.lifecycles;
-
-import javax.enterprise.inject.Vetoed;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.jdo.listener.InstanceLifecycleEvent;
-
-import org.apache.isis.core.transaction.changetracking.EntityChangeTracker;
-
-/**
- * To be registered with each JDO PersistenceManager instance, in order to collect
- * persistence related metrics
- * 
- * @since 2.0
- *
- */
-@Vetoed // managed by isis
-public class LoadLifecycleListenerForIsis 
-implements javax.jdo.listener.LoadLifecycleListener {
-    
-    @Inject private Provider<EntityChangeTracker> entityChangeTrackerProvider;
-
-    @Override
-    public void postLoad(final InstanceLifecycleEvent event) {
-        entityChangeTrackerProvider.get().incrementLoaded();
-    }
-
-}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java
index 4c7ec36..c0034e2 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java
@@ -32,6 +32,4 @@ final class _Utils {
         return pojo!=null; // why would a Persistable ever be something different?
     }
     
-  
-    
 }
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession.java
deleted file mode 100644
index d5cd541..0000000
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.persistence.jdo.integration.persistence;
-
-import org.apache.isis.core.interaction.session.InteractionSession;
-import org.apache.isis.core.metamodel.context.HasMetaModelContext;
-import org.apache.isis.persistence.jdo.provider.persistence.HasPersistenceManager;
-
-public interface JdoPersistenceSession 
-extends 
-    HasMetaModelContext,
-    HasPersistenceManager {
-
-    /**
-     * Binds this {@link JdoPersistenceSession} to the current {@link InteractionSession}.
-     */
-    void open();
-    
-    /**
-     * Commits the current transaction and unbinds this 
-     * {@link JdoPersistenceSession} from the current {@link InteractionSession}.
-     */
-    void close();
-
-}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DnApplication.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/DnApplication.java
similarity index 97%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DnApplication.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/DnApplication.java
index 29e8b7b..f502b01 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DnApplication.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/DnApplication.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.session;
 
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoEntityChangeEmitter.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoEntityChangeEmitter.java
similarity index 94%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoEntityChangeEmitter.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoEntityChangeEmitter.java
index 46cb463..c4b3c4d 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoEntityChangeEmitter.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoEntityChangeEmitter.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.session;
 
 import javax.jdo.PersistenceManager;
 
@@ -27,14 +27,14 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
 import org.apache.isis.core.transaction.changetracking.EntityChangeTracker;
 import org.apache.isis.persistence.jdo.datanucleus.entities.DnEntityStateProvider;
-import org.apache.isis.persistence.jdo.integration.lifecycles.IsisLifecycleListener;
+import org.apache.isis.persistence.jdo.integration.lifecycles.JdoLifecycleListener;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 
 @RequiredArgsConstructor
-public class JdoEntityChangeEmitter implements IsisLifecycleListener.EntityChangeEmitter {
+public class JdoEntityChangeEmitter implements JdoLifecycleListener.EntityChangeEmitter {
 
     private final MetaModelContext metaModelContext;
     private final PersistenceManager persistenceManager;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoFetchResultHandler.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoFetchResultHandler.java
similarity index 96%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoFetchResultHandler.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoFetchResultHandler.java
index 10fdad3..6f6a143 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoFetchResultHandler.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoFetchResultHandler.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.session;
 
 import javax.annotation.Nullable;
 import javax.jdo.PersistenceManager;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoPersistenceLifecycleService.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoIntegrationService.java
similarity index 63%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoPersistenceLifecycleService.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoIntegrationService.java
index f7118b1..7e1ff2d 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/JdoPersistenceLifecycleService.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoIntegrationService.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.integration.lifecycles;
+package org.apache.isis.persistence.jdo.integration.session;
 
 import java.util.Optional;
 
@@ -34,26 +34,24 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
-import org.apache.isis.core.interaction.events.InteractionLifecycleEvent;
+import org.apache.isis.core.interaction.scope.InteractionScopeAware;
 import org.apache.isis.core.interaction.session.InteractionSession;
 import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.runtime.events.AppLifecycleEvent;
 import org.apache.isis.persistence.jdo.datanucleus.config.DnSettings;
-import org.apache.isis.persistence.jdo.integration.persistence.DnApplication;
-import org.apache.isis.persistence.jdo.integration.persistence.JdoPersistenceSession;
-import org.apache.isis.persistence.jdo.integration.persistence.JdoPersistenceSession5;
 import org.apache.isis.persistence.jdo.spring.integration.TransactionAwarePersistenceManagerFactoryProxy;
 
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
 
 @Service
-@Named("isisJdoDn5.JdoPersistenceLifecycleService")
+@Named("isisJdoIntegration.JdoIntegrationService")
 @Order(OrderPrecedence.MIDPOINT)
 @Primary
 @Qualifier("Default")
 @Log4j2
-public class JdoPersistenceLifecycleService {
+public class JdoIntegrationService 
+implements InteractionScopeAware {
 
     @Inject MetaModelContext metaModelContext;
     @Inject TransactionAwarePersistenceManagerFactoryProxy txAwarePmfProxy;
@@ -89,47 +87,25 @@ public class JdoPersistenceLifecycleService {
         }
 
     }
-
-    @EventListener(InteractionLifecycleEvent.class)
-    public void onInteractionLifecycleEvent(InteractionLifecycleEvent event) {
-
-        val eventType = event.getEventType();
-        val interactionSession = event.getInteractionSession();
-
-        if(log.isDebugEnabled()) {
-            log.debug("received session event {}", eventType);
-        }
-
-        switch (eventType) {
-        case HAS_STARTED:
-            onInteractionStarted(interactionSession);
-            break;
-        case IS_ENDING:
-            onInteractionEnding(interactionSession);
-            break;
-
-        default:
-            throw _Exceptions.unmatchedCase(eventType);
-        }
-
-    }
-
-    // -- HELPER
-
-    private void onInteractionStarted(final InteractionSession interactionSession) {
-        val persistenceSession = new JdoPersistenceSession5(metaModelContext, txAwarePmfProxy);
-        interactionSession.putAttribute(JdoPersistenceSession.class, persistenceSession);
+    
+    @Override
+    public void beforeEnteringTransactionalBoundary(InteractionSession interactionSession) {
+        val persistenceSession = new JdoInteractionSession(metaModelContext, txAwarePmfProxy);
+        interactionSession.putAttribute(JdoInteractionSession.class, persistenceSession);
         persistenceSession.open();
     }
-
-    private void onInteractionEnding(final InteractionSession interactionSession) {
-        currentSession(interactionSession)
-        .ifPresent(JdoPersistenceSession::close);
+    
+    @Override
+    public void afterLeavingTransactionalBoundary(InteractionSession interactionSession) {
+        currentJdoSession(interactionSession)
+            .ifPresent(JdoInteractionSession::close);
     }
 
-    private Optional<JdoPersistenceSession> currentSession(final InteractionSession interactionSession) {
+    // -- HELPER
+
+    private Optional<JdoInteractionSession> currentJdoSession(final InteractionSession interactionSession) {
         return Optional.ofNullable(interactionSession)
-                .map(session->session.getAttribute(JdoPersistenceSession.class));
+                .map(session->session.getAttribute(JdoInteractionSession.class));
     }
 
 
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession5.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoInteractionSession.java
similarity index 59%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession5.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoInteractionSession.java
index 4bf1ac2..7e96a24 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession5.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/JdoInteractionSession.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.session;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,11 +24,13 @@ import java.util.List;
 import javax.enterprise.inject.Vetoed;
 import javax.jdo.PersistenceManager;
 
+import org.apache.isis.commons.internal.assertions._Assert.OpenCloseState;
+import org.apache.isis.core.interaction.session.InteractionSession;
+import org.apache.isis.core.metamodel.context.HasMetaModelContext;
 import org.apache.isis.core.metamodel.context.MetaModelContext;
+import org.apache.isis.core.runtime.events.AppLifecycleEventService;
 import org.apache.isis.core.transaction.changetracking.EntityChangeTracker;
-import org.apache.isis.persistence.jdo.integration.lifecycles.IsisLifecycleListener;
-import org.apache.isis.persistence.jdo.integration.lifecycles.JdoStoreLifecycleListenerForIsis;
-import org.apache.isis.persistence.jdo.integration.lifecycles.LoadLifecycleListenerForIsis;
+import org.apache.isis.persistence.jdo.integration.lifecycles.JdoLifecycleListener;
 import org.apache.isis.persistence.jdo.spring.integration.TransactionAwarePersistenceManagerFactoryProxy;
 
 import lombok.Getter;
@@ -39,17 +41,18 @@ import lombok.extern.log4j.Log4j2;
  * A wrapper around the JDO {@link PersistenceManager}.
  */
 @Vetoed @Log4j2
-public class JdoPersistenceSession5
-implements
-    JdoPersistenceSession {
+public class JdoInteractionSession
+implements HasMetaModelContext {
 
     // -- FIELDS
-
-    @Getter(onMethod_ = {@Override}) private PersistenceManager persistenceManager;
+    
     @Getter(onMethod_ = {@Override}) private final MetaModelContext metaModelContext;
 
+    private PersistenceManager persistenceManager;
     private final TransactionAwarePersistenceManagerFactoryProxy pmf;
     private final List<Runnable> onCloseTasks = new ArrayList<>();
+    
+    private OpenCloseState state = OpenCloseState.NOT_INITIALIZED;
 
     // -- CONSTRUCTOR
     
@@ -58,7 +61,7 @@ implements
      * persisted objects and persist changes to the object that are saved.
      * @param pmf 
      */
-    public JdoPersistenceSession5(
+    public JdoInteractionSession(
             final MetaModelContext metaModelContext, 
             final TransactionAwarePersistenceManagerFactoryProxy pmf) {
 
@@ -68,38 +71,16 @@ implements
 
         this.metaModelContext = metaModelContext;
         this.pmf = pmf;
-                
-        this.state = State.NOT_INITIALIZED;
-    }
-
-    // -- STATE
-
-    protected enum State {
-        NOT_INITIALIZED, OPEN, CLOSED
-        ;
-        protected void ensureNotOpened() {
-            if (this != State.NOT_INITIALIZED) {
-                throw new IllegalStateException("Persistence session has already been initialized");
-            }
-        }
-        protected void ensureOpened() {
-            ensureStateIs(State.OPEN);
-        }
-        private void ensureStateIs(final State stateRequired) {
-            if (this == stateRequired) {
-                return;
-            }
-            throw new IllegalStateException("State is: " + this + "; should be: " + stateRequired);
-        }
     }
-    
-    protected State state = State.NOT_INITIALIZED;
 
     // -- OPEN
 
-    @Override
+    /**
+     * Binds this {@link JdoInteractionSession} to the current {@link InteractionSession}.
+     */
     public void open() {
-        state.ensureNotOpened();
+        
+        state.assertEquals(OpenCloseState.NOT_INITIALIZED);
 
         if (log.isDebugEnabled()) {
             log.debug("opening {}", this);
@@ -107,20 +88,23 @@ implements
         
         this.persistenceManager = integrateWithApplicationLayer(pmf.getPersistenceManager());
         
-        this.state = State.OPEN;
+        this.state = OpenCloseState.OPEN;
     }
 
     // -- CLOSE
 
-
-
-    @Override
+    /**
+     * Commits the current transaction and unbinds this 
+     * {@link JdoInteractionSession} from the current {@link InteractionSession}.
+     */
     public void close() {
 
-        if (state == State.CLOSED) {
+        if (state.isClosed()) {
             // nothing to do
             return;
         }
+        
+        this.state = OpenCloseState.CLOSED;
 
         try {
         
@@ -133,42 +117,34 @@ implements
             
         } catch(final Throwable ex) {
             // ignore
-            log.error(
-                    "close: failed to close JDO persistenceManager; continuing to avoid memory leakage", ex);
+            log.error("close: failed to close JDO persistenceManager; continuing to avoid memory leakage", ex);
         }
         
         persistenceManager = null; // detach
-
-        this.state = State.CLOSED;
+        
     }
     
     // -- HELPER
     
     private PersistenceManager integrateWithApplicationLayer(final PersistenceManager persistenceManager) {
         
+        val appLifecycleEventService = metaModelContext.getServiceRegistry()
+                .lookupServiceElseFail(AppLifecycleEventService.class);
+        
         val entityChangeTracker = metaModelContext.getServiceRegistry()
                 .lookupServiceElseFail(EntityChangeTracker.class);
         
         val entityChangeEmitter = 
                 new JdoEntityChangeEmitter(getMetaModelContext(), persistenceManager, entityChangeTracker);
         
-        val isisLifecycleListener = new IsisLifecycleListener(entityChangeEmitter);
-        persistenceManager.addInstanceLifecycleListener(isisLifecycleListener, (Class[]) null);
-
         // install JDO specific entity change listeners ...
         
-        val loadLifecycleListener = new LoadLifecycleListenerForIsis();
-        val storeLifecycleListener = new JdoStoreLifecycleListenerForIsis();
-        
-        getServiceInjector().injectServicesInto(loadLifecycleListener);
-        getServiceInjector().injectServicesInto(storeLifecycleListener);
-            
-        persistenceManager.addInstanceLifecycleListener(loadLifecycleListener, (Class[]) null);
-        persistenceManager.addInstanceLifecycleListener(storeLifecycleListener, (Class[]) null);
+        val jdoLifecycleListener = new JdoLifecycleListener(
+                entityChangeEmitter, entityChangeTracker, appLifecycleEventService);
+        persistenceManager.addInstanceLifecycleListener(jdoLifecycleListener, (Class[]) null);
         
         onCloseTasks.add(()->{
-            persistenceManager.removeInstanceLifecycleListener(loadLifecycleListener);
-            persistenceManager.removeInstanceLifecycleListener(storeLifecycleListener);
+            persistenceManager.removeInstanceLifecycleListener(jdoLifecycleListener);
         });
         
         return persistenceManager;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DnApplicationComponents.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnApplicationComponents.java
similarity index 93%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DnApplicationComponents.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnApplicationComponents.java
index 3a350b0..be82a2e 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DnApplicationComponents.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnApplicationComponents.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.session;
 
 import static org.apache.isis.commons.internal.base._NullSafe.stream;
 
@@ -33,6 +33,7 @@ import javax.jdo.PersistenceManagerFactory;
 import org.datanucleus.PersistenceNucleusContext;
 import org.datanucleus.PropertyNames;
 import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
+import org.datanucleus.enhancer.EnhancementHelper;
 import org.datanucleus.metadata.MetaDataListener;
 import org.datanucleus.metadata.MetaDataManager;
 import org.datanucleus.store.schema.SchemaAwareStoreManager;
@@ -45,7 +46,6 @@ import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.persistence.jdo.integration.config.DataNucleusPropertiesAware;
-import org.apache.isis.persistence.jdo.integration.lifecycles.DataNucleusLifeCycleHelper;
 import org.apache.isis.persistence.jdo.provider.metamodel.facets.object.query.JdoNamedQuery;
 import org.apache.isis.persistence.jdo.provider.metamodel.facets.object.query.JdoQueryFacet;
 
@@ -79,12 +79,23 @@ final class _DnApplicationComponents {
     /**
      * Marks the end of DataNucleus' life-cycle. Purges any state associated with DN.
      * Subsequent calls have no effect.
-     *
+     * <p>
+     * (requires datanucleus-core 4 or 5 >= 5.1.5)
      * @since 2.0.0
      */
     public void shutdown() {
         if(persistenceManagerFactory != null) {
-            DataNucleusLifeCycleHelper.cleanUp(persistenceManagerFactory);
+            
+            try {
+                final ClassLoader cl = _Context.getDefaultClassLoader();
+                persistenceManagerFactory.close();
+                // for info, on why we do this see
+                // https://github.com/datanucleus/datanucleus-core/issues/272
+                EnhancementHelper.getInstance().unregisterClasses(cl);
+            } catch (Exception e) {
+                // ignore, since it only affects re-deploy-ability, which is nice to have but not critical
+            }
+            
             persistenceManagerFactory = null;
         }
     }
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DnStoreManagerType.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnStoreManagerType.java
similarity index 98%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DnStoreManagerType.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnStoreManagerType.java
index 8ba0347..332f71c 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DnStoreManagerType.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_DnStoreManagerType.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.session;
 
 import java.util.Map;
 import java.util.function.Function;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_Utils.java
similarity index 98%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_Utils.java
index 25abda4..66ab6ea 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/session/_Utils.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.session;
 
 import javax.annotation.Nullable;
 import javax.jdo.PersistenceManager;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index efdc873..57bd20f 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -26,7 +26,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
-import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -38,7 +37,8 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.metrics.MetricsService;
 import org.apache.isis.commons.internal.debug._Probe;
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.interaction.events.InteractionLifecycleEvent;
+import org.apache.isis.core.interaction.scope.InteractionScopeAware;
+import org.apache.isis.core.interaction.session.InteractionSession;
 import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
 import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
 import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
@@ -62,25 +62,21 @@ public class Configuration_headless {
     @Service
     @Order(OrderPrecedence.MIDPOINT)
     @RequiredArgsConstructor(onConstructor_ = {@Inject})
-    public static class HeadlessCommandSupport {
+    public static class HeadlessCommandSupport
+    implements InteractionScopeAware {
 
-//        private final Provider<InteractionContext> interactionContextProvider;
-//        private final CommandDispatcher commandDispatcher;
-
-
-        @EventListener(InteractionLifecycleEvent.class)
-        public void onIsisInteractionLifecycleEvent(InteractionLifecycleEvent event) {
-            switch(event.getEventType()) {
-            case HAS_STARTED:
-                _Probe.errOut("Interaction HAS_STARTED conversationId=%s", event.getConversationId());
-                setupCommandCreateIfMissing();
-                break;
-            case IS_ENDING:
-                _Probe.errOut("Interaction IS_ENDING conversationId=%s", event.getConversationId());
-                break;
-            default:
-                break;
-            }
+//      private final Provider<InteractionContext> interactionContextProvider;
+//      private final CommandDispatcher commandDispatcher;
+        
+        @Override
+        public void beforeEnteringTransactionalBoundary(InteractionSession interactionSession) {
+            _Probe.errOut("Interaction HAS_STARTED conversationId=%s", interactionSession.getUniqueId());
+            setupCommandCreateIfMissing();
+        }
+        
+        @Override
+        public void afterLeavingTransactionalBoundary(InteractionSession interactionSession) {
+            _Probe.errOut("Interaction IS_ENDING conversationId=%s", interactionSession.getUniqueId());
         }
         
         public void setupCommandCreateIfMissing() {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionBoundaryProbe.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionBoundaryProbe.java
index 21b14cc..a9c6fc4 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionBoundaryProbe.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionBoundaryProbe.java
@@ -26,7 +26,8 @@ import org.junit.jupiter.api.Assertions;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
-import org.apache.isis.core.interaction.events.InteractionLifecycleEvent;
+import org.apache.isis.core.interaction.scope.InteractionScopeAware;
+import org.apache.isis.core.interaction.session.InteractionSession;
 import org.apache.isis.core.transaction.events.TransactionAfterCompletionEvent;
 import org.apache.isis.core.transaction.events.TransactionBeforeCompletionEvent;
 import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
@@ -36,33 +37,20 @@ import lombok.extern.log4j.Log4j2;
 
 @Service
 @Log4j2
-public class InteractionBoundaryProbe {
+public class InteractionBoundaryProbe implements InteractionScopeAware {
 
     @Inject private KVStoreForTesting kvStoreForTesting;
     
-    
-    @EventListener(InteractionLifecycleEvent.class)
-    public void onIsisInteractionLifecycleEvent(InteractionLifecycleEvent event) {
-        switch(event.getEventType()) {
-        case HAS_STARTED:
-            onIaStarted();
-            break;
-        case IS_ENDING:
-            onIaEnded();
-            break;
-        default:
-            break;
-        }
-    }
-
     /** INTERACTION BEGIN BOUNDARY */
-    public void onIaStarted() {
+    @Override
+    public void beforeEnteringTransactionalBoundary(InteractionSession interactionSession) {
         log.debug("iaStarted");
         kvStoreForTesting.incrementCounter(InteractionBoundaryProbe.class, "iaStarted");
     }
-
+    
     /** INTERACTION END BOUNDARY */
-    public void onIaEnded() {
+    @Override
+    public void afterLeavingTransactionalBoundary(InteractionSession interactionSession) {
         log.debug("iaEnded");
         kvStoreForTesting.incrementCounter(InteractionBoundaryProbe.class, "iaEnded");
     }