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 2016/05/20 07:04:39 UTC
[18/31] isis git commit: ISIS-1409: internal components of
RuntimeContext subclasses are now internal domain services;
RuntimeContext hierarchy collapsed into a single class.
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
index 17d7134..6232877 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@@ -59,7 +59,7 @@ public class IsisSession implements SessionScopedComponent {
private final IsisSessionFactory isisSessionFactory;
private final AuthenticationSession authenticationSession;
- private PersistenceSession persistenceSession; // only non-final so can be
+ private PersistenceSessionInternal persistenceSession; // only non-final so can be
// replaced in tests.
private final int id;
private long accessTime;
@@ -69,7 +69,7 @@ public class IsisSession implements SessionScopedComponent {
public IsisSession(
final IsisSessionFactory sessionFactory,
final AuthenticationSession authenticationSession,
- final PersistenceSession persistenceSession) {
+ final PersistenceSessionInternal persistenceSession) {
// global context
ensureThatArg(sessionFactory, is(not(nullValue())), "execution context factory is required");
@@ -99,7 +99,7 @@ public class IsisSession implements SessionScopedComponent {
* Closes session.
*/
public void close() {
- final PersistenceSession persistenceSession = getPersistenceSession();
+ final PersistenceSessionInternal persistenceSession = getPersistenceSession();
if(persistenceSession != null) {
persistenceSession.close();
}
@@ -172,9 +172,9 @@ public class IsisSession implements SessionScopedComponent {
//region > Persistence Session
/**
- * The {@link PersistenceSession} within this {@link IsisSession}.
+ * The {@link PersistenceSessionInternal} within this {@link IsisSession}.
*/
- public PersistenceSession getPersistenceSession() {
+ public PersistenceSessionInternal getPersistenceSession() {
return persistenceSession;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index 9522be5..d05d199 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.installerregistry.InstallerLookup;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
@@ -114,7 +114,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* Creates and {@link IsisSession#open() open}s the {@link IsisSession}.
*/
public IsisSession openSession(final AuthenticationSession authenticationSession) {
- final PersistenceSession persistenceSession =
+ final PersistenceSessionInternal persistenceSession =
persistenceSessionFactory.createPersistenceSession(
servicesInjector, getSpecificationLoader(), authenticationSession);
ensureThatArg(persistenceSession, is(not(nullValue())));
@@ -124,7 +124,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
protected IsisSession newIsisSession(
final AuthenticationSession authenticationSession,
- final PersistenceSession persistenceSession) {
+ final PersistenceSessionInternal persistenceSession) {
return new IsisSession(this, authenticationSession, persistenceSession);
}
@@ -190,7 +190,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
/**
* The {@link org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory} that will be used to create
- * {@link PersistenceSession} {@link IsisSession#getPersistenceSession()
+ * {@link PersistenceSessionInternal} {@link IsisSession#getPersistenceSession()
* within} the {@link IsisSession}.
*/
public PersistenceSessionFactory getPersistenceSessionFactory() {
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
index db9b05d..ffc6ba8 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.runtime.persistence.PersistenceConstants;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.objectstore.jdo.service.RegisterEntities;
/**
@@ -87,7 +87,7 @@ public class IsisConfigurationForJdoIntegTests extends IsisConfigurationDefault
addDataNucleusProperty("datanucleus.cache.level2.mode","ENABLE_SELECTIVE");
// automatically install any fixtures that might have been registered
- add(PersistenceSession.INSTALL_FIXTURES_KEY , "true");
+ add(PersistenceSessionInternal.INSTALL_FIXTURES_KEY , "true");
add(PersistenceConstants.ENFORCE_SAFE_SEMANTICS, ""+PersistenceConstants.ENFORCE_SAFE_SEMANTICS_DEFAULT);
@@ -98,13 +98,13 @@ public class IsisConfigurationForJdoIntegTests extends IsisConfigurationDefault
@Programmatic
public final IsisConfigurationForJdoIntegTests addDataNucleusProperty(final String key, final String value) {
- add(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + key, value);
+ add(PersistenceSessionInternal.DATANUCLEUS_PROPERTIES_ROOT + key, value);
return this;
}
@Programmatic
public final IsisConfigurationForJdoIntegTests putDataNucleusProperty(final String key, final String value) {
- put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + key, value);
+ put(PersistenceSessionInternal.DATANUCLEUS_PROPERTIES_ROOT + key, value);
return this;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
index 47fd736..5dc33fe 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
@@ -22,7 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.core.runtime.system.persistence.IsisLifecycleListener2;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
/**
* @deprecated - retained only for backward compatibility of logging (in logging.properties file).
@@ -32,7 +32,7 @@ public class IsisLifecycleListener extends IsisLifecycleListener2 {
public static final Logger LOG = LoggerFactory.getLogger(IsisLifecycleListener.class);
- public IsisLifecycleListener(final PersistenceSession persistenceSession) {
+ public IsisLifecycleListener(final PersistenceSessionInternal persistenceSession) {
super(persistenceSession);
throw new RuntimeException("Use IsisLifecycleListener2 instead");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index 1ff10a5..83ad191 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -48,7 +48,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChec
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
@@ -192,7 +192,7 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
// //////////////////////////////////////
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 3951bea..25e88d8 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -61,7 +61,7 @@ public class PojoAdapterTest {
@Mock
private AuthenticationSession mockAuthenticationSession;
@Mock
- private PersistenceSession mockPersistenceSession;
+ private PersistenceSessionInternal mockPersistenceSession;
@Mock
private Localization mockLocalization;
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index 23f4ed5..d58ad58 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -33,11 +33,11 @@ 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.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
public class PojoAdapterBuilder {
- private PersistenceSession persistenceSession;
+ private PersistenceSessionInternal persistenceSession;
private PojoAdapterBuilder(){
}
@@ -166,7 +166,7 @@ public class PojoAdapterBuilder {
return this;
}
- public PojoAdapterBuilder with(PersistenceSession persistenceSession) {
+ public PojoAdapterBuilder with(PersistenceSessionInternal persistenceSession) {
this.persistenceSession = persistenceSession;
return this;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index 1cb45ec..927466f 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
+import org.apache.isis.core.metamodel.services.msgbroker.MessageBrokerServiceInternal;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
@@ -65,9 +65,9 @@ public class ObjectActionLayoutXmlDefaultTest {
@Mock
private ServicesInjector mockServicesInjector;
@Mock
- private MessageBrokerService mockMessageBrokerService;
+ private MessageBrokerServiceInternal mockMessageBrokerServiceInternal;
@Mock
- private PersistenceSessionService mockPersistenceSessionService;
+ private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
@Before
public void setUp() throws Exception {
@@ -81,7 +81,7 @@ public class ObjectActionLayoutXmlDefaultTest {
action = new ObjectActionDefault(mockFacetedMethod, new ObjectMemberDependencies(
mockSpecificationLookup, mockServicesInjector,
- mockPersistenceSessionService));
+ mockPersistenceSessionServiceInternal));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index 4c3ae79..42b214d 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
+import org.apache.isis.core.metamodel.services.msgbroker.MessageBrokerServiceInternal;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
@@ -75,9 +75,9 @@ public class OneToManyAssociationDefaultTest {
@Mock
private AdapterManager mockAdapterManager;
@Mock
- private MessageBrokerService mockMessageBrokerService;
+ private MessageBrokerServiceInternal mockMessageBrokerServiceInternal;
@Mock
- private PersistenceSessionService mockPersistenceSessionService;
+ private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
@Mock
private FacetedMethod mockPeer;
@Mock
@@ -96,7 +96,7 @@ public class OneToManyAssociationDefaultTest {
allowingSpecLoaderToReturnSpecs();
association = new OneToManyAssociationDefault(mockPeer, new ObjectMemberDependencies(
mockSpecificationLookup, mockServicesInjector,
- mockPersistenceSessionService));
+ mockPersistenceSessionServiceInternal));
}
private void allowingSpecLoaderToReturnSpecs() {
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
index 7477085..2f751f1 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.DomainObjectReprRenderer;
public interface RendererContext {
@@ -38,7 +38,7 @@ public interface RendererContext {
IsisConfiguration getConfiguration();
- PersistenceSession getPersistenceSession();
+ PersistenceSessionInternal getPersistenceSession();
/**
* @deprecated - replaced by {@link #getPersistenceSession()}.
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index a0314ae..e0aa28b 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseExce
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
/**
@@ -845,7 +845,7 @@ public final class JsonValueEncoder {
return testAdapterManager != null? testAdapterManager: getPersistenceSession();
}
- private static PersistenceSession getPersistenceSession() {
+ private static PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index 226ae18..2748019 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.DomainModel;
@@ -73,7 +73,7 @@ public class ResourceContext implements RendererContext6 {
private final SpecificationLoader specificationLoader;
private final AuthenticationSession authenticationSession;
private final Localization localization;
- private final PersistenceSession persistenceSession;
+ private final PersistenceSessionInternal persistenceSession;
private List<List<String>> followLinks;
@@ -104,7 +104,7 @@ public class ResourceContext implements RendererContext6 {
final SpecificationLoader specificationLoader,
final AuthenticationSession authenticationSession,
final Localization localization,
- final PersistenceSession persistenceSession,
+ final PersistenceSessionInternal persistenceSession,
final InteractionInitiatedBy interactionInitiatedBy) {
this.httpHeaders = httpHeaders;
@@ -291,7 +291,7 @@ public class ResourceContext implements RendererContext6 {
}
@Override
- public PersistenceSession getPersistenceSession() {
+ public PersistenceSessionInternal getPersistenceSession() {
return persistenceSession;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
index 783dc6d..325f6af 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -31,7 +31,7 @@ import org.jboss.resteasy.plugins.providers.jaxb.JAXBXmlRootElementProvider;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
@Provider
@@ -57,7 +57,7 @@ public class RestfulObjectsJaxbWriterForXml extends JAXBXmlRootElementProvider {
marshaller.setAdapter(PersistentEntityAdapter.class, new PersistentEntityAdapter() {
@Override
protected BookmarkService getBookmarkService() {
- final PersistenceSession persistenceSession = IsisContext.getPersistenceSession();
+ final PersistenceSessionInternal persistenceSession = IsisContext.getPersistenceSession();
final ServicesInjector servicesInjector = persistenceSession.getServicesInjector();
return servicesInjector.lookupService(BookmarkService.class);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index 916d500..e51c040 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext6;
@@ -89,7 +89,7 @@ public class DomainResourceHelper {
}
@Override
- public PersistenceSession getPersistenceSession() {
+ public PersistenceSessionInternal getPersistenceSession() {
return rendererContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index fae5b0c..ae7beda 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -44,7 +44,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
@@ -192,7 +192,7 @@ public abstract class ResourceAbstract {
return IsisContext.getSpecificationLoader();
}
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
index d051294..98030e6 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
@@ -31,7 +31,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
@Path("/swagger")
public class SwaggerSpecResource {
@@ -118,7 +118,7 @@ public class SwaggerSpecResource {
return getPersistenceSession().getServicesInjector();
}
- PersistenceSession getPersistenceSession() {
+ PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
index e344dba..ce36146 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.restfulobjects.server.util;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
public final class OidUtils {
@@ -55,7 +55,7 @@ public final class OidUtils {
final String oidStrUnencoded) {
RootOid rootOid = RootOid.deString(oidStrUnencoded, getOidMarshaller());
- final PersistenceSession persistenceSession = rendererContext.getPersistenceSession();
+ final PersistenceSessionInternal persistenceSession = rendererContext.getPersistenceSession();
return persistenceSession.adapterForAny(rootOid);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
index 226e806..298cab1 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
/**
* Implementation of a Wicket {@link IConverter} for {@link ObjectAdapter}s,
@@ -68,7 +68,7 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
// Dependencies (from context)
// //////////////////////////////////////////////////////////
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
index ba66e40..4859663 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
/**
@@ -81,7 +81,7 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
// Dependencies (from context)
// //////////////////////////////////////////////////////////
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
index 66be00a..bfb4fa8 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
@@ -35,7 +35,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
/**
@@ -152,7 +152,7 @@ public class LocalizerForIsis extends Localizer {
return getPersistenceSession().getServicesInjector();
}
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index f5738a8..3b59a46 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.linking.DeepLinkService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
@@ -71,7 +71,7 @@ public class DeepLinkServiceWicket implements DeepLinkService {
}
}
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java
index 3c6d78f..791695a 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java
@@ -20,9 +20,9 @@
package org.apache.isis.viewer.wicket.model.isis;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
public interface PersistenceSessionProvider {
- PersistenceSession getPersistenceSession();
+ PersistenceSessionInternal getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index ab8d0a3..706360d 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.memento.Memento;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
public class ObjectAdapterMemento implements Serializable {
@@ -460,7 +460,7 @@ public class ObjectAdapterMemento implements Serializable {
// Dependencies (from context)
//////////////////////////////////////////////////
- private static PersistenceSession getPersistenceSession() {
+ private static PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 58d9ce3..99bf973 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -50,7 +50,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
@@ -514,7 +514,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
return getPersistenceSessionStatic().getServicesInjector();
}
- private static PersistenceSession getPersistenceSessionStatic() {
+ private static PersistenceSessionInternal getPersistenceSessionStatic() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
index 52b0d58..44ddf68 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
@@ -24,7 +24,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
/**
* Adapter for {@link LoadableDetachableModel}s, providing access to some of the
@@ -50,7 +50,7 @@ public abstract class ModelAbstract<T> extends LoadableDetachableModel<T> {
return IsisContext.getAuthenticationSession();
}
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
index 336f27e..f649cda 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.*;
@@ -92,7 +92,7 @@ public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
// Dependencies (from IsisContext)
// ///////////////////////////////////////////////////////////////////
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
index e340d72..9489d8c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -146,7 +146,7 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
// ///////////////////////////////////////////////////////////////////
@Override
- public PersistenceSession getPersistenceSession() {
+ public PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
index dd0c68d..73cc105 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
@@ -74,7 +74,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
final ActionPromptProvider promptProvider = ActionPromptProvider.Util.getFrom(getPage());
final ActionPrompt actionPrompt = promptProvider.getActionPrompt();
final ActionPromptHeaderPanel titlePanel =
- PersistenceSession.ConcurrencyChecking.executeWithConcurrencyCheckingDisabled(
+ PersistenceSessionInternal.ConcurrencyChecking.executeWithConcurrencyCheckingDisabled(
new Callable<ActionPromptHeaderPanel>() {
@Override
public ActionPromptHeaderPanel call() throws Exception {
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index b7435ad..8ad0ad4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -63,7 +63,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
import org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract;
@@ -433,7 +433,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
return getPersistenceSession().getServicesInjector();
}
- protected PersistenceSession getPersistenceSession() {
+ protected PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 6f2b7aa..e0a79cf 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
@@ -102,7 +102,7 @@ public abstract class FormAbstract<T> extends Form<T>
// ///////////////////////////////////////////////////////////////////
@Override
- public PersistenceSession getPersistenceSession() {
+ public PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index a3c4235..9953c99 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -146,7 +146,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
// ///////////////////////////////////////////////////////////////////
@Override
- public PersistenceSession getPersistenceSession() {
+ public PersistenceSessionInternal getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index cc52a94..4c67195 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -53,8 +53,8 @@ import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAware;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceAware;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcher;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
@@ -304,7 +304,7 @@ public class WrapperFactoryDefault implements WrapperFactory,
private AdapterManager adapterManager;
- private PersistenceSessionService persistenceSessionService;
+ private PersistenceSessionServiceInternal persistenceSessionServiceInternal;
protected AdapterManager getAdapterManager() {
return adapterManager;
@@ -317,13 +317,13 @@ public class WrapperFactoryDefault implements WrapperFactory,
- protected PersistenceSessionService getPersistenceSessionService() {
- return persistenceSessionService;
+ protected PersistenceSessionServiceInternal getPersistenceSessionService() {
+ return persistenceSessionServiceInternal;
}
@Programmatic
@Override
- public void setPersistenceSessionService(final PersistenceSessionService persistenceSessionService) {
- this.persistenceSessionService = persistenceSessionService;
+ public void setPersistenceSessionService(final PersistenceSessionServiceInternal persistenceSessionServiceInternal) {
+ this.persistenceSessionServiceInternal = persistenceSessionServiceInternal;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index 7d80efd..3e2db21 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -60,7 +60,7 @@ import org.apache.isis.core.metamodel.consent.InteractionResult;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.ImperativeFacet.Intent;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -78,7 +78,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
private final AuthenticationSessionProvider authenticationSessionProvider;
private final SpecificationLoader specificationLoader;
private final AdapterManager adapterManager;
- private final PersistenceSessionService persistenceSessionService;
+ private final PersistenceSessionServiceInternal persistenceSessionServiceInternal;
private final ProxyContextHandler proxy;
private final ExecutionMode executionMode;
@@ -124,7 +124,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
final AuthenticationSessionProvider authenticationSessionProvider,
final SpecificationLoader specificationLoader,
final AdapterManager adapterManager,
- final PersistenceSessionService persistenceSessionService,
+ final PersistenceSessionServiceInternal persistenceSessionServiceInternal,
final ProxyContextHandler proxy) {
super(delegate, wrapperFactory, mode);
@@ -132,7 +132,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
this.authenticationSessionProvider = authenticationSessionProvider;
this.specificationLoader = specificationLoader;
this.adapterManager = adapterManager;
- this.persistenceSessionService = persistenceSessionService;
+ this.persistenceSessionServiceInternal = persistenceSessionServiceInternal;
this.executionMode = mode;
try {
@@ -797,8 +797,8 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
return adapterManager;
}
- protected PersistenceSessionService getPersistenceSessionService() {
- return persistenceSessionService;
+ protected PersistenceSessionServiceInternal getPersistenceSessionService() {
+ return persistenceSessionServiceInternal;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
index 2b38ef5..d85fa45 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.ensure.Ensure;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -51,16 +51,16 @@ public class ProxyContextHandler {
final AuthenticationSessionProvider authenticationSessionProvider,
final SpecificationLoader specificationLookup,
final AdapterManager adapterManager,
- final PersistenceSessionService persistenceSessionService) {
+ final PersistenceSessionServiceInternal persistenceSessionServiceInternal) {
Ensure.ensureThatArg(wrapperFactory, is(not(nullValue())));
Ensure.ensureThatArg(authenticationSessionProvider, is(not(nullValue())));
Ensure.ensureThatArg(specificationLookup, is(not(nullValue())));
Ensure.ensureThatArg(adapterManager, is(not(nullValue())));
- Ensure.ensureThatArg(persistenceSessionService, is(not(nullValue())));
+ Ensure.ensureThatArg(persistenceSessionServiceInternal, is(not(nullValue())));
final DomainObjectInvocationHandler<T> invocationHandler = new DomainObjectInvocationHandler<T>(domainObject, wrapperFactory, mode, authenticationSessionProvider, specificationLookup, adapterManager,
- persistenceSessionService, this);
+ persistenceSessionServiceInternal, this);
return proxyCreator.instantiateProxy(invocationHandler);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 7cd2c9f..2b43ea3 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -51,8 +51,8 @@ import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyCle
import org.apache.isis.core.metamodel.facets.properties.update.init.PropertyInitializationFacetViaSetterMethod;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaModifyMethod;
import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethod;
-import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
+import org.apache.isis.core.metamodel.services.msgbroker.MessageBrokerServiceInternal;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -86,9 +86,9 @@ public class WrapperFactoryDefaultTest_wrappedObject {
@Mock
private AuthenticationSessionProvider mockAuthenticationSessionProvider;
@Mock
- private PersistenceSessionService mockPersistenceSessionService;
+ private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
@Mock
- private MessageBrokerService mockMessageBrokerService;
+ private MessageBrokerServiceInternal mockMessageBrokerServiceInternal;
@Mock
private ServicesInjector mockServicesInjector;
@Mock
@@ -137,7 +137,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
objectMemberDependencies = new ObjectMemberDependencies(
mockSpecificationLoader, mockServicesInjector,
- mockPersistenceSessionService);
+ mockPersistenceSessionServiceInternal);
employeeRepository = new EmployeeRepositoryImpl();
@@ -206,7 +206,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
wrapperFactory = createWrapperFactory();
wrapperFactory.setAdapterManager(mockAdapterManager);
- wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
+ wrapperFactory.setPersistenceSessionService(mockPersistenceSessionServiceInternal);
wrapperFactory.specificationLoader = mockSpecificationLoader;
wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
@@ -290,7 +290,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAdapterForStringSmith).isDestroyed();
will(returnValue(false));
- allowing(mockPersistenceSessionService).adapterFor("Smith");
+ allowing(mockPersistenceSessionServiceInternal).adapterFor("Smith");
will(returnValue(mockAdapterForStringSmith));
}});
@@ -332,7 +332,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAdapterForStringJones).getSpecification();
will(returnValue(mockStringSpec));
- allowing(mockPersistenceSessionService).adapterFor("Jones");
+ allowing(mockPersistenceSessionServiceInternal).adapterFor("Jones");
will(returnValue(mockAdapterForStringJones));
ignoring(mockStringSpec);
http://git-wip-us.apache.org/repos/asf/isis/blob/a2a9f519/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index dd05e8a..05398f1 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -54,7 +54,7 @@ import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractAlwaysEverywhere;
import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaSetterMethod;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -84,7 +84,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
@Mock
private IsisConfiguration mockConfiguration;
@Mock
- private PersistenceSessionService mockPersistenceSessionService;
+ private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
@Mock
private SpecificationLoader mockSpecificationLoader;
@@ -127,7 +127,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
wrapperFactory = createWrapperFactory();
wrapperFactory.setAdapterManager(mockAdapterManager);
wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
- wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
+ wrapperFactory.setPersistenceSessionService(mockPersistenceSessionServiceInternal);
wrapperFactory.specificationLoader = mockSpecificationLoader;
context.checking(new Expectations() {