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 2015/08/28 19:16:05 UTC

[05/12] isis git commit: ISIS-1044: introducing interaction contexts - analogous to those visibility/usability/validity checking, for accessing properties, collections, invoking actions; also action prompt (for choices and autoComplete).

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 6117789..8cdc794 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -19,9 +19,6 @@
 
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 import com.google.common.collect.Lists;
 
 import org.jmock.Expectations;
@@ -36,12 +33,16 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.TypedHolder;
 import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.interactions.ParameterAccessingContext;
 import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
 public class ObjectActionParameterAbstractTest_getId_and_getName {
 
     @Rule
@@ -70,7 +71,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
         private ObjectSpecification objectSpec;
 
         @Override
-        public ObjectAdapter get(final ObjectAdapter owner) {
+        public ObjectAdapter get(final ObjectAdapter owner, final ParameterAccessingContext parameterAccessingContext) {
             return null;
         }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index b9806c7..e4a4141 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -19,9 +19,6 @@
 
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;
 import org.junit.Before;
@@ -30,6 +27,7 @@ import org.junit.Test;
 
 import org.apache.isis.applib.annotation.Where;
 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.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
@@ -39,6 +37,7 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
 import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
 import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
+import org.apache.isis.core.metamodel.interactions.AssociationAccessingContext;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.spec.Instance;
@@ -47,6 +46,9 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class ObjectAssociationAbstractTest {
 
     @Rule
@@ -60,6 +62,9 @@ public class ObjectAssociationAbstractTest {
     @Mock
     private ObjectSpecification objectSpecification;
 
+    @Mock
+    private IsisConfiguration mockConfiguration;
+
 
     public static class Customer {
         private String firstName;
@@ -73,22 +78,38 @@ public class ObjectAssociationAbstractTest {
     public void setup() {
         facetedMethod = FacetedMethod.createForProperty(Customer.class, "firstName");
         
-        objectAssociation = new ObjectAssociationAbstract(facetedMethod, FeatureType.PROPERTY, objectSpecification, new ObjectMemberContext(DeploymentCategory.PRODUCTION, null, null, null, null, null)) {
+        objectAssociation = new ObjectAssociationAbstract<AssociationAccessingContext<?>>(facetedMethod, FeatureType.PROPERTY, objectSpecification, new ObjectMemberContext(
+                mockConfiguration, DeploymentCategory.PRODUCTION, null, null, null, null, null
+        )) {
+
+            @Override
+            public AssociationAccessingContext<?> createAccessingInteractionContext(
+                    final AuthenticationSession session,
+                    final InteractionInvocationMethod interactionMethod,
+                    final ObjectAdapter targetObjectAdapter) {
+                return null;
+            }
 
             @Override
-            public ObjectAdapter get(final ObjectAdapter fromObject) {
+            public ObjectAdapter get(
+                    final ObjectAdapter fromObject,
+                    final AssociationAccessingContext<?> associationAccessingContext) {
                 return null;
             }
 
             @Override
-            public boolean isEmpty(final ObjectAdapter adapter) {
+            public boolean isEmpty(
+                    final ObjectAdapter adapter,
+                    final AssociationAccessingContext collectionAccessingContext) {
                 return false;
             }
 
             @Override
             public ObjectAdapter[] getChoices(
+                    final AssociationAccessingContext<?> associationAccessingContext,
                     final ObjectAdapter object,
-                    final AuthenticationSession authenticationSession, final DeploymentCategory deploymentCategory) {
+                    final AuthenticationSession authenticationSession,
+                    final DeploymentCategory deploymentCategory) {
                 return null;
             }
 
@@ -102,12 +123,20 @@ public class ObjectAssociationAbstractTest {
             }
 
             @Override
-            public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, Where where) {
+            public UsabilityContext<?> createUsableInteractionContext(
+                    final AuthenticationSession session,
+                    final InteractionInvocationMethod invocationMethod,
+                    final ObjectAdapter target,
+                    Where where) {
                 return null;
             }
 
             @Override
-            public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter, Where where) {
+            public VisibilityContext<?> createVisibleInteractionContext(
+                    final AuthenticationSession session,
+                    final InteractionInvocationMethod invocationMethod,
+                    final ObjectAdapter targetObjectAdapter,
+                    final Where where) {
                 return null;
             }
 
@@ -133,7 +162,7 @@ public class ObjectAssociationAbstractTest {
 
             @Override
             public ObjectAdapter[] getAutoComplete(
-                    ObjectAdapter object,
+                    final AssociationAccessingContext<?> associationAccessingContext, ObjectAdapter object,
                     String searchArg,
                     final AuthenticationSession authenticationSession, final DeploymentCategory deploymentCategory) {
                 return null;

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 2dc1409..a187137 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -23,9 +23,11 @@ import org.jmock.auto.Mock;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+
 import org.apache.isis.applib.annotation.When;
 import org.apache.isis.applib.annotation.Where;
 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.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
@@ -35,6 +37,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
+import org.apache.isis.core.metamodel.interactions.AssociationAccessingContext;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.spec.Instance;
@@ -57,6 +60,9 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
     @Mock
     private ObjectSpecification mockObjectSpecification;
 
+    @Mock
+    private IsisConfiguration mockConfiguration;
+
     public static class Customer {
         public String getFirstName() {
             return null;
@@ -67,22 +73,34 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
     public void setup() {
         facetedMethod = FacetedMethod.createForProperty(Customer.class, "firstName");
         
-        objectAssociation = new ObjectAssociationAbstract(
+        objectAssociation = new ObjectAssociationAbstract<AssociationAccessingContext<?>>(
                 facetedMethod, FeatureType.PROPERTY, mockObjectSpecification,
-                new ObjectMemberContext(DeploymentCategory.PRODUCTION, null, null, null, null, null)) {
+                new ObjectMemberContext(mockConfiguration, DeploymentCategory.PRODUCTION, null, null, null, null, null)) {
+
+            @Override public AssociationAccessingContext<?> createAccessingInteractionContext(
+                    final AuthenticationSession session,
+                    final InteractionInvocationMethod interactionMethod,
+                    final ObjectAdapter targetObjectAdapter) {
+                return null;
+            }
 
             @Override
-            public ObjectAdapter get(final ObjectAdapter fromObject) {
+            public ObjectAdapter get(
+                    final ObjectAdapter fromObject,
+                    final AssociationAccessingContext<?> associationAccessingContext) {
                 return null;
             }
 
             @Override
-            public boolean isEmpty(final ObjectAdapter adapter) {
+            public boolean isEmpty(
+                    final ObjectAdapter adapter,
+                    final AssociationAccessingContext<?> collectionAccessingContext) {
                 return false;
             }
 
             @Override
             public ObjectAdapter[] getChoices(
+                    final AssociationAccessingContext<?> associationAccessingContext,
                     final ObjectAdapter object,
                     final AuthenticationSession authenticationSession,
                     final DeploymentCategory deploymentCategory) {
@@ -138,6 +156,7 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
 
             @Override
             public ObjectAdapter[] getAutoComplete(
+                    final AssociationAccessingContext<?> associationAccessingContext,
                     final ObjectAdapter object,
                     final String searchArg,
                     final AuthenticationSession authenticationSession,

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
index 90ac06e..3eaf03f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
@@ -19,15 +19,28 @@
 
 package org.apache.isis.core.runtime.fixturedomainservice;
 
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.interactions.AssociationAccessingContext;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
 import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
@@ -74,7 +87,7 @@ public class ObjectFixtureFilePersistor {
         return objects;
     }
 
-    private void loadFieldData(final ObjectAdapter object, final LoadedObjects loaded, final String line) {
+    private void loadFieldData(final ObjectAdapter objectAdapter, final LoadedObjects loaded, final String line) {
         final int pos = line.indexOf(':');
         if (pos == -1) {
             throw new FixtureException("no colon (:) in: " + line.trim());
@@ -82,10 +95,15 @@ public class ObjectFixtureFilePersistor {
         final String name = line.substring(0, pos).trim();
         String data = line.substring(pos + 1).trim();
         try {
-            final ObjectAssociation association = object.getSpecification().getAssociation(name);
+            final ObjectAssociation association = objectAdapter.getSpecification().getAssociation(name);
+            final AssociationAccessingContext accessingInteractionContext =
+                    (AssociationAccessingContext)association
+                            .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, objectAdapter);
             if (data.trim().length() == 0) {
-                if (!association.isEmpty(object) && association instanceof OneToOneAssociation) {
-                    ((OneToOneAssociation) association).set(object, null);
+                if (!association.isEmpty(objectAdapter, accessingInteractionContext) && association instanceof OneToOneAssociation) {
+                    final OneToOneAssociation property = (OneToOneAssociation) association;
+                    final PropertyAccessingContext pac = (PropertyAccessingContext) accessingInteractionContext;
+                    property.set(pac, objectAdapter, null);
                 }
             } else {
                 if (association.isOneToManyAssociation()) {
@@ -94,17 +112,19 @@ public class ObjectFixtureFilePersistor {
                     for (int i = 0; i < ids.length; i++) {
                         elements[i] = loaded.get(ids[i]);
                     }
-                    final ObjectAdapter collection = association.get(object);
+                    final ObjectAdapter collection = association.get(objectAdapter, accessingInteractionContext);
                     final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
                     facet.init(collection, elements);
                 } else if (association.getSpecification().isParseable()) {
                     data = data.replaceAll("\\n", "\n");
                     final ParseableFacet facet = association.getSpecification().getFacet(ParseableFacet.class);
                     final ObjectAdapter value = facet.parseTextEntry(null, data, null);
-                    ((OneToOneAssociation) association).initAssociation(object, value);
+                    final OneToOneAssociation property = (OneToOneAssociation) association;
+                    property.initAssociation(objectAdapter, value);
                 } else if (association.isOneToOneAssociation()) {
                     final ObjectAdapter value = loaded.get(data);
-                    ((OneToOneAssociation) association).initAssociation(object, value);
+                    final OneToOneAssociation property = (OneToOneAssociation) association;
+                    property.initAssociation(objectAdapter, value);
                 }
             }
         } catch (final ObjectSpecificationException e) {
@@ -133,8 +153,11 @@ public class ObjectFixtureFilePersistor {
                 continue;
             }
 
-            final ObjectAdapter associatedObject = association.get(adapter);
-            final boolean isEmpty = association.isEmpty(adapter);
+            final AssociationAccessingContext associationAccessingContext =
+                    (AssociationAccessingContext) association.createAccessingInteractionContext(
+                            null, InteractionInvocationMethod.BY_USER, adapter);
+            final ObjectAdapter associatedObject = association.get(adapter, associationAccessingContext);
+            final boolean isEmpty = association.isEmpty(adapter, associationAccessingContext);
             final String associationId = association.getId();
             writer.write("  " + associationId + ": ");
             if (isEmpty) {

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
index 1f3c0c1..75c3bf6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
@@ -42,7 +42,9 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.interactions.AssociationAccessingContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Persistability;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -100,8 +102,11 @@ public class ObjectFixtureService {
                 continue;
             }
 
-            final ObjectAdapter associatedObject = association.get(adapter);
-            final boolean isEmpty = association.isEmpty(adapter);
+            final AssociationAccessingContext associationAccessingContext = (AssociationAccessingContext) association
+                    .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, adapter);
+
+            final ObjectAdapter associatedObject = association.get(adapter, associationAccessingContext);
+            final boolean isEmpty = association.isEmpty(adapter, associationAccessingContext);
             if (isEmpty) {
                 continue;
             }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
index 1238995..052b8a3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
@@ -40,11 +40,15 @@ 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.ParentedOid;
 import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
 import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.interactions.AssociationAccessingContext;
+import org.apache.isis.core.metamodel.interactions.CollectionAccessingContext;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -129,18 +133,22 @@ public class Memento implements Serializable {
         return data;
     }
 
-    private void createAssociationData(final ObjectAdapter adapter, final ObjectData data, final ObjectAssociation objectAssoc) {
+    private void createAssociationData(
+            final ObjectAdapter adapter, final ObjectData data, final ObjectAssociation objectAssoc) {
         Object assocData;
+        final AssociationAccessingContext associationAccessingContext = (AssociationAccessingContext) objectAssoc
+                .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, adapter);
         if (objectAssoc.isOneToManyAssociation()) {
-            final ObjectAdapter collAdapter = objectAssoc.get(adapter);
+            final ObjectAdapter collAdapter = objectAssoc.get(adapter, associationAccessingContext);
             assocData = createCollectionData(collAdapter);
         } else if (objectAssoc.getSpecification().isEncodeable()) {
             final EncodableFacet facet = objectAssoc.getSpecification().getFacet(EncodableFacet.class);
-            final ObjectAdapter value = objectAssoc.get(adapter);
+            final ObjectAdapter value = objectAssoc.get(adapter, associationAccessingContext);
             assocData = facet.toEncodedString(value);
         } else if (objectAssoc.isOneToOneAssociation()) {
-            final ObjectAdapter referencedAdapter = ((OneToOneAssociation) objectAssoc).get(adapter
-            );
+            final OneToOneAssociation property = (OneToOneAssociation) objectAssoc;
+            final PropertyAccessingContext propertyAccessingContext = (PropertyAccessingContext) associationAccessingContext;
+            final ObjectAdapter referencedAdapter = property.get(adapter, propertyAccessingContext);
             assocData = createReferenceData(referencedAdapter);
         } else {
             throw new UnknownTypeException(objectAssoc);
@@ -368,45 +376,53 @@ public class Memento implements Serializable {
         }
     }
 
-    private void updateOneToManyAssociation(final ObjectAdapter objectAdapter, final OneToManyAssociation otma, final CollectionData collectionData) {
-        final ObjectAdapter collection = otma.get(objectAdapter);
-        final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
+    private void updateOneToManyAssociation(
+            final ObjectAdapter objectAdapter, final OneToManyAssociation collection, final CollectionData collectionData) {
+        final CollectionAccessingContext collectionAccessingContext = collection
+                .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, objectAdapter);
+        final ObjectAdapter collectionAdapter = collection.get(objectAdapter, collectionAccessingContext);
+        final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collectionAdapter);
         final List<ObjectAdapter> original = Lists.newArrayList();
-        for (final ObjectAdapter adapter : facet.iterable(collection)) {
+        for (final ObjectAdapter adapter : facet.iterable(collectionAdapter)) {
             original.add(adapter);
         }
 
         final Data[] elements = collectionData.elements;
         for (final Data data : elements) {
             final ObjectAdapter elementAdapter = recreateReference(data);
-            if (!facet.contains(collection, elementAdapter)) {
+            if (!facet.contains(collectionAdapter, elementAdapter)) {
                 if (LOG.isDebugEnabled()) {
-                    LOG.debug("  association " + otma + " changed, added " + elementAdapter.getOid());
+                    LOG.debug("  association " + collection + " changed, added " + elementAdapter.getOid());
                 }
-                otma.addElement(objectAdapter, elementAdapter);
+                collection.addElement(collectionAccessingContext, objectAdapter, elementAdapter);
             } else {
-                otma.removeElement(objectAdapter, elementAdapter);
+                collection.removeElement(collectionAccessingContext, objectAdapter, elementAdapter);
             }
         }
 
         for (final ObjectAdapter element : original) {
             if (LOG.isDebugEnabled()) {
-                LOG.debug("  association " + otma + " changed, removed " + element.getOid());
+                LOG.debug("  association " + collection + " changed, removed " + element.getOid());
             }
-            otma.removeElement(objectAdapter, element);
+            collection.removeElement(collectionAccessingContext, objectAdapter, element);
         }
     }
 
-    private void updateOneToOneAssociation(final ObjectAdapter objectAdapter, final OneToOneAssociation otoa, final Data assocData) {
+    private void updateOneToOneAssociation(
+            final ObjectAdapter objectAdapter,
+            final OneToOneAssociation property,
+            final Data assocData) {
         if (assocData == null) {
-            otoa.initAssociation(objectAdapter, null);
+            property.initAssociation(objectAdapter, null);
         } else {
             final ObjectAdapter ref = recreateReference(assocData);
-            if (otoa.get(objectAdapter) != ref) {
+            final PropertyAccessingContext propertyAccessingContext = property
+                    .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, objectAdapter);
+            if (property.get(objectAdapter, propertyAccessingContext) != ref) {
                 if (LOG.isDebugEnabled()) {
-                    LOG.debug("  association " + otoa + " changed to " + ref.getOid());
+                    LOG.debug("  association " + property + " changed to " + ref.getOid());
                 }
-                otoa.initAssociation(objectAdapter, ref);
+                property.initAssociation(objectAdapter, ref);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
index f3b2eb9..cd2b629 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
@@ -20,8 +20,10 @@
 package org.apache.isis.core.runtime.persistence.adaptermanager;
 
 import java.util.Iterator;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.components.Resettable;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
@@ -36,9 +38,15 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
-import org.apache.isis.core.metamodel.adapter.oid.*;
+import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
+import org.apache.isis.core.metamodel.adapter.oid.CollectionOid;
+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.metamodel.adapter.oid.TypedOid;
 import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
 import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.ElementSpecificationProviderFromTypeOfFacet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
@@ -46,6 +54,8 @@ import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetU
 import org.apache.isis.core.metamodel.facets.object.parented.ParentedFacet;
 import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
+import org.apache.isis.core.metamodel.interactions.AssociationAccessingContext;
+import org.apache.isis.core.metamodel.interactions.CollectionAccessingContext;
 import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -60,7 +70,10 @@ import org.apache.isis.core.runtime.system.persistence.OidGenerator;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
 
 /**
  * Responsible for managing the {@link ObjectAdapter adapter}s and {@link Oid
@@ -589,16 +602,17 @@ public class AdapterManagerDefault implements AdapterManager, Iterable<ObjectAda
 
     private void remapContainedAggregatedObject(final ObjectAdapter adapter, final RootOid persistedRootOid) {
         for (final ObjectAssociation association: adapter.getSpecification().getAssociations(Contributed.EXCLUDED)) {
+            final AssociationAccessingContext associationAccessingContext =
+                    (AssociationAccessingContext)association.createAccessingInteractionContext(
+                            null, InteractionInvocationMethod.BY_USER, adapter);
             if (association.isOneToManyAssociation() && !association.isNotPersisted()) {
-                final ObjectAdapter collection = association.get(adapter);
-                final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
-                for (final ObjectAdapter element : facet.iterable(collection)) {
+                final ObjectAdapter collectionAdapter = association.get(adapter, associationAccessingContext);
+                final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collectionAdapter);
+                for (final ObjectAdapter element : facet.iterable(collectionAdapter)) {
                    remapAggregatedObject(element, persistedRootOid);
                 }
-                
             } else if (association.getSpecification().isParented()) {
-                final ObjectAdapter referencedAdapter = association.get(adapter);
-    
+                final ObjectAdapter referencedAdapter = association.get(adapter, associationAccessingContext);
                 if(referencedAdapter == null) {
                     continue;
                 }
@@ -619,9 +633,13 @@ public class AdapterManagerDefault implements AdapterManager, Iterable<ObjectAda
         remapContainedAggregatedObject(adapter, persistedRootOid);
     }
 
-	private static Object getCollectionPojo(final OneToManyAssociation association, final ObjectAdapter ownerAdapter) {
-        final PropertyOrCollectionAccessorFacet accessor = association.getFacet(PropertyOrCollectionAccessorFacet.class);
-        return accessor.getProperty(ownerAdapter, null, null);
+	private Object getCollectionPojo(final OneToManyAssociation collection, final ObjectAdapter ownerAdapter) {
+
+        final CollectionAccessingContext collectionAccessingContext = collection
+                .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, ownerAdapter);
+
+        final PropertyOrCollectionAccessorFacet accessor = collection.getFacet(PropertyOrCollectionAccessorFacet.class);
+        return accessor.getProperty(collectionAccessingContext, ownerAdapter, null, null);
     }
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index 06e97bd..10decfa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -387,6 +387,11 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
     // ///////////////////////////////////////////
 
     @Override
+    public IsisConfiguration getConfiguration() {
+        return IsisContext.getConfiguration();
+    }
+
+    @Override
     public DeploymentCategory getDeploymentCategory() {
         return IsisContext.getDeploymentType().getDeploymentCategory();
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java
index fb2a81d..9ffbe79 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java
@@ -20,13 +20,17 @@
 package org.apache.isis.core.runtime.persistence.objectstore.algorithm;
 
 import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.isis.core.commons.util.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
+import org.apache.isis.core.metamodel.interactions.AssociationAccessingContext;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
@@ -89,14 +93,18 @@ class PersistAlgorithmDefault extends PersistAlgorithmAbstract {
                 if (objectAssoc.isNotPersisted()) {
                     continue;
                 }
+                final AssociationAccessingContext<?> associationAccessingContext =
+                        (AssociationAccessingContext<?>) objectAssoc.createAccessingInteractionContext(
+                                null, InteractionInvocationMethod.BY_USER, adapter);
+
                 if (objectAssoc.isOneToManyAssociation()) {
-                    final ObjectAdapter collection = objectAssoc.get(adapter);
-                    if (collection == null) {
+                    final ObjectAdapter collectionAdapter = objectAssoc.get(adapter, associationAccessingContext);
+                    if (collectionAdapter == null) {
                         throw new ObjectPersistenceException("Collection " + objectAssoc.getName() + " does not exist in " + adapter.getSpecification().getFullIdentifier());
                     }
-                    makePersistent(collection, toPersistObjectSet);
+                    makePersistent(collectionAdapter, toPersistObjectSet);
                 } else {
-                    final ObjectAdapter fieldValue = objectAssoc.get(adapter);
+                    final ObjectAdapter fieldValue = objectAssoc.get(adapter, associationAccessingContext);
                     if (fieldValue == null) {
                         continue;
                     }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
index 6ccc43e..17f44e8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
@@ -22,6 +22,8 @@ package org.apache.isis.core.runtime.persistence.query;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.AssociationAccessingContext;
 import org.apache.isis.core.metamodel.services.container.query.QueryFindByPattern;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -49,44 +51,47 @@ public class PersistenceQueryFindByPattern extends PersistenceQueryBuiltInAbstra
         return objectSpec.equals(requiredSpec) && matchesPattern(pattern, object);
     }
 
-    private boolean matchesPattern(final ObjectAdapter pattern, final ObjectAdapter instance) {
-        final ObjectAdapter object = instance;
-        final ObjectSpecification nc = object.getSpecification();
+    private boolean matchesPattern(final ObjectAdapter patternAdapter, final ObjectAdapter objectAdapter) {
+        final ObjectSpecification nc = objectAdapter.getSpecification();
         final List<ObjectAssociation> fields = nc.getAssociations(Contributed.EXCLUDED);
 
         for (int f = 0; f < fields.size(); f++) {
-            final ObjectAssociation fld = fields.get(f);
+            final ObjectAssociation association = fields.get(f);
 
             // are ignoring internal collections - these probably should be
             // considered
             
             // ignore non-persistent fields - there is no persisted field to
             // compare against
-            if (fld.isNotPersisted()) {
+            if (association.isNotPersisted()) {
                 continue;
             }
-            if (!fld.isOneToOneAssociation()) {
+            if (!association.isOneToOneAssociation()) {
                 continue;
             } 
 
             // if pattern contains empty value then it matches anything
-            if (fld.isEmpty(pattern)) {
+            final AssociationAccessingContext patternAccessingContext = (AssociationAccessingContext) association
+                    .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, patternAdapter);
+            if (association.isEmpty(patternAdapter, patternAccessingContext)) {
                 continue;
             }
 
             // find the object to match against, if any
-            final ObjectAdapter reqd = fld.get(pattern);
+            final ObjectAdapter reqd = association.get(patternAdapter, patternAccessingContext);
             if (reqd == null) {
                 continue;
             }
 
             // find the object; it's a bust if nothing
-            final ObjectAdapter search = fld.get(object);
+            final AssociationAccessingContext adapterAccessingContext = (AssociationAccessingContext) association
+                    .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, objectAdapter);
+            final ObjectAdapter search = association.get(objectAdapter, adapterAccessingContext);
             if (search == null) {
                 return false;
             }
 
-            if (fld.getSpecification().isValue()) {
+            if (association.getSpecification().isValue()) {
                 // compare values directly
                 if (!reqd.getObject().equals(search.getObject())) {
                     return false;

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
index 997cce0..1863ed2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
@@ -29,6 +29,8 @@ import org.apache.isis.applib.services.command.CommandContext;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.RootOid;
 import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.ActionExecutingContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -110,7 +112,10 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
                     }
 
                     final ObjectAdapter[] argAdapters = argAdaptersFor(aim);
-                    final ObjectAdapter resultAdapter = objectAction.execute(targetAdapter, argAdapters);
+                    final ActionExecutingContext actionExecutingContext = objectAction
+                            .createExecutingInteractionContext(null, InteractionInvocationMethod.BY_USER, targetAdapter,
+                                    argAdapters);
+                    final ObjectAdapter resultAdapter = objectAction.execute(actionExecutingContext, targetAdapter, argAdapters);
                     if(resultAdapter != null) {
                         Bookmark resultBookmark = CommandUtil.bookmarkFor(resultAdapter);
                         command.setResult(resultBookmark);

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index b07a00c..45531f9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -76,6 +76,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
 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.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
@@ -86,10 +87,12 @@ import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFace
 import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext.TransactionState;
 import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.runtime.persistence.PersistenceConstants;
 import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
 import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
@@ -1144,16 +1147,16 @@ public class IsisTransaction implements TransactionScopedComponent {
     public static class AdapterAndProperty {
         
         private final ObjectAdapter objectAdapter;
-        private final ObjectAssociation property;
+        private final OneToOneAssociation property;
         private final Bookmark bookmark;
         private final String propertyId;
         private final String bookmarkStr;
 
-        public static AdapterAndProperty of(ObjectAdapter adapter, ObjectAssociation property) {
+        public static AdapterAndProperty of(ObjectAdapter adapter, OneToOneAssociation property) {
             return new AdapterAndProperty(adapter, property);
         }
 
-        private AdapterAndProperty(ObjectAdapter adapter, ObjectAssociation property) {
+        private AdapterAndProperty(ObjectAdapter adapter, OneToOneAssociation property) {
             this.objectAdapter = adapter;
             this.property = property;
 
@@ -1215,7 +1218,9 @@ public class IsisTransaction implements TransactionScopedComponent {
         }
 
         private Object getPropertyValue() {
-            ObjectAdapter referencedAdapter = property.get(objectAdapter);
+            final PropertyAccessingContext propertyAccessingContext = property
+                    .createAccessingInteractionContext(null, InteractionInvocationMethod.BY_USER, objectAdapter);
+            ObjectAdapter referencedAdapter = property.get(objectAdapter, propertyAccessingContext);
             return referencedAdapter == null ? null : referencedAdapter.getObject();
         }
 
@@ -1333,9 +1338,10 @@ public class IsisTransaction implements TransactionScopedComponent {
      */
     public void enlistCreated(ObjectAdapter adapter) {
         enlist(adapter, ChangeKind.CREATE);
-        for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+        for (ObjectAssociation objectAssociation : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+            final OneToOneAssociation property = (OneToOneAssociation) objectAssociation;
             final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property);
-            if(property.isNotPersisted()) {
+            if(objectAssociation.isNotPersisted()) {
                 continue;
             }
             if(changedObjectProperties.containsKey(aap)) {
@@ -1359,9 +1365,10 @@ public class IsisTransaction implements TransactionScopedComponent {
      */
     public void enlistUpdating(ObjectAdapter adapter) {
         enlist(adapter, ChangeKind.UPDATE);
-        for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+        for (ObjectAssociation association : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+            final OneToOneAssociation property = (OneToOneAssociation) association;
             final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property);
-            if(property.isNotPersisted()) {
+            if(association.isNotPersisted()) {
                 continue;
             }
             if(changedObjectProperties.containsKey(aap)) {
@@ -1389,9 +1396,10 @@ public class IsisTransaction implements TransactionScopedComponent {
         if(!enlisted) {
             return;
         }
-        for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+        for (ObjectAssociation association : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+            final OneToOneAssociation property = (OneToOneAssociation) association;
             final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property);
-            if(property.isNotPersisted()) {
+            if(association.isNotPersisted()) {
                 continue;
             }
             if(changedObjectProperties.containsKey(aap)) {

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
index 5aabbed..4b6668b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
@@ -28,6 +28,7 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
 import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetAbstract;
+import org.apache.isis.core.metamodel.interactions.ActionExecutingContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -53,14 +54,14 @@ public class ActionInvocationFacetWrapTransaction extends ActionInvocationFacetA
 
     @Override
     public ObjectAdapter invoke(
-            final ObjectAction owningAction,
+            final ActionExecutingContext actionExecutingContext, final ObjectAction owningAction,
             final ObjectAdapter targetAdapter,
             final ObjectAdapter[] argumentAdapters,
             final AuthenticationSession authenticationSession, final DeploymentCategory deploymentCategory) {
         final ObjectAdapter result = getTransactionManager().executeWithinTransaction(new TransactionalClosureWithReturnAbstract<ObjectAdapter>() {
             @Override
             public ObjectAdapter execute() {
-                return underlyingFacet.invoke(owningAction, targetAdapter, argumentAdapters, authenticationSession,
+                return underlyingFacet.invoke(actionExecutingContext, owningAction, targetAdapter, argumentAdapters, authenticationSession,
                         deploymentCategory);
             }
         });
@@ -69,13 +70,14 @@ public class ActionInvocationFacetWrapTransaction extends ActionInvocationFacetA
 
     @Override
     public ObjectAdapter invoke(
-            final ObjectAdapter targetAdapter,
+            final ActionExecutingContext actionExecutingContext, final ObjectAdapter targetAdapter,
             final ObjectAdapter[] argumentAdapters,
-            final AuthenticationSession authenticationSession, final DeploymentCategory deploymentCategory) {
+            final AuthenticationSession authenticationSession,
+            final DeploymentCategory deploymentCategory) {
         final ObjectAdapter result = getTransactionManager().executeWithinTransaction(new TransactionalClosureWithReturnAbstract<ObjectAdapter>() {
             @Override
             public ObjectAdapter execute() {
-                return underlyingFacet.invoke(targetAdapter, argumentAdapters, authenticationSession,
+                return underlyingFacet.invoke(actionExecutingContext, targetAdapter, argumentAdapters, authenticationSession,
                         deploymentCategory);
             }
         });

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
index 9424ae1..f169ee0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
@@ -23,6 +23,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacetAbstract;
+import org.apache.isis.core.metamodel.interactions.CollectionAccessingContext;
 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.transaction.IsisTransactionManager;
@@ -43,16 +44,19 @@ public class CollectionAddToFacetWrapTransaction extends CollectionAddToFacetAbs
     }
 
     @Override
-    public void add(final ObjectAdapter adapter, final ObjectAdapter referencedAdapter) {
+    public void add(
+            final CollectionAccessingContext collectionAccessingContext,
+            final ObjectAdapter adapter,
+            final ObjectAdapter referencedAdapter) {
         if (adapter.isTransient()) {
             // NOT !adapter.isPersistent();
             // (value adapters are neither persistent or transient)
-            underlyingFacet.add(adapter, referencedAdapter);
+            underlyingFacet.add(collectionAccessingContext, adapter, referencedAdapter);
         } else {
             getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
                 @Override
                 public void execute() {
-                    underlyingFacet.add(adapter, referencedAdapter);
+                    underlyingFacet.add(collectionAccessingContext, adapter, referencedAdapter);
                 }
             });
         }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
index cb39203..9b53651 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
@@ -23,6 +23,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
+import org.apache.isis.core.metamodel.interactions.CollectionAccessingContext;
 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.transaction.IsisTransactionManager;
@@ -43,16 +44,19 @@ public class CollectionRemoveFromFacetWrapTransaction extends CollectionRemoveFr
     }
 
     @Override
-    public void remove(final ObjectAdapter adapter, final ObjectAdapter referencedAdapter) {
+    public void remove(
+            final CollectionAccessingContext collectionAccessingContext,
+            final ObjectAdapter adapter,
+            final ObjectAdapter referencedAdapter) {
         if (adapter.isTransient()) {
             // NOT !adapter.isPersistent();
             // (value adapters are neither persistent or transient)
-            underlyingFacet.remove(adapter, referencedAdapter);
+            underlyingFacet.remove(collectionAccessingContext, adapter, referencedAdapter);
         } else {
             getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
                 @Override
                 public void execute() {
-                    underlyingFacet.remove(adapter, referencedAdapter);
+                    underlyingFacet.remove(collectionAccessingContext, adapter, referencedAdapter);
                 }
             });
         }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
index da68a17..d258c99 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
@@ -23,6 +23,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
 import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacetAbstract;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 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.transaction.IsisTransactionManager;
@@ -43,16 +44,16 @@ public class PropertyClearFacetWrapTransaction extends PropertyClearFacetAbstrac
     }
 
     @Override
-    public void clearProperty(final ObjectAdapter adapter) {
-        if (adapter.isTransient()) {
+    public void clearProperty(final PropertyAccessingContext propertyAccessingContext, final ObjectAdapter targetAdapter) {
+        if (targetAdapter.isTransient()) {
             // NOT !adapter.isPersistent();
             // (value adapters are neither persistent or transient)
-            underlyingFacet.clearProperty(adapter);
+            underlyingFacet.clearProperty(propertyAccessingContext, targetAdapter);
         } else {
             getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
                 @Override
                 public void execute() {
-                    underlyingFacet.clearProperty(adapter);
+                    underlyingFacet.clearProperty(propertyAccessingContext, targetAdapter);
                 }
             });
         }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
index e5f7141..0b31e68 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
@@ -23,6 +23,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
 import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
 import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetAbstract;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 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.transaction.IsisTransactionManager;
@@ -43,16 +44,18 @@ public class PropertySetterFacetWrapTransaction extends PropertySetterFacetAbstr
     }
 
     @Override
-    public void setProperty(final ObjectAdapter adapter, final ObjectAdapter referencedAdapter) {
+    public void setProperty(
+            final PropertyAccessingContext propertyAccessingContext, final ObjectAdapter adapter,
+            final ObjectAdapter referencedAdapter) {
         if (adapter.isTransient()) {
             // NOT !adapter.isPersistent();
             // (value adapters are neither persistent or transient)
-            underlyingFacet.setProperty(adapter, referencedAdapter);
+            underlyingFacet.setProperty(propertyAccessingContext, adapter, referencedAdapter);
         } else {
             getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
                 @Override
                 public void execute() {
-                    underlyingFacet.setProperty(adapter, referencedAdapter);
+                    underlyingFacet.setProperty(propertyAccessingContext, adapter, referencedAdapter);
                 }
             });
         }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
index 31b93b6..7b66daf 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
@@ -19,11 +19,6 @@
 
 package org.apache.isis.core.runtime.system;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;
 import org.junit.Before;
@@ -32,6 +27,7 @@ import org.junit.Test;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.adapter.ServicesProvider;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -41,11 +37,15 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
-import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionImpl;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
 public class ObjectActionImplTest {
 
     @Rule
@@ -67,6 +67,8 @@ public class ObjectActionImplTest {
     private ServicesProvider mockServicesProvider;
     @Mock
     private QuerySubmitter mockQuerySubmitter;
+    @Mock
+    private IsisConfiguration mockConfiguration;
 
     @Before
     public void setUp() throws Exception {
@@ -78,7 +80,8 @@ public class ObjectActionImplTest {
             }
         });
 
-        action = new ObjectActionImpl(mockFacetedMethod, new ObjectMemberContext(DeploymentCategory.PRODUCTION, mockAuthenticationSessionProvider, mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter, mockServicesProvider));
+        action = new ObjectActionImpl(mockFacetedMethod, new ObjectMemberContext(mockConfiguration, DeploymentCategory.PRODUCTION, mockAuthenticationSessionProvider, mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter, mockServicesProvider
+        ));
     }
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 5eaaebe..4ff35ab 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -199,7 +199,9 @@ class ObjectMemberAbstractImpl extends ObjectMemberAbstract {
     }
 
     protected ObjectMemberAbstractImpl(final String id) {
-        super(FacetedMethod.createForProperty(Customer.class, "firstName"), FeatureType.PROPERTY, new ObjectMemberContext(DeploymentCategory.PRODUCTION, null, null, null, null, null));
+        super(FacetedMethod.createForProperty(Customer.class, "firstName"), FeatureType.PROPERTY, new ObjectMemberContext(
+                null, DeploymentCategory.PRODUCTION, null, null, null, null, null
+        ));
     }
 
     @Override
@@ -217,13 +219,21 @@ class ObjectMemberAbstractImpl extends ObjectMemberAbstract {
     }
 
     @Override
-    public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, Where where) {
-        return new PropertyUsabilityContext(DeploymentCategory.PRODUCTION, session, invocationMethod, target, getIdentifier(), where);
+    public UsabilityContext<?> createUsableInteractionContext(
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            Where where) {
+        return new PropertyUsabilityContext(getConfiguration(), DeploymentCategory.PRODUCTION, session, invocationMethod, target, getIdentifier(), where);
     }
 
     @Override
-    public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter, Where where) {
-        return new PropertyVisibilityContext(DeploymentCategory.PRODUCTION, session, invocationMethod, targetObjectAdapter, getIdentifier(), where);
+    public VisibilityContext<?> createVisibleInteractionContext(
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter targetObjectAdapter,
+            Where where) {
+        return new PropertyVisibilityContext(getConfiguration(), DeploymentCategory.PRODUCTION, session, invocationMethod, targetObjectAdapter, getIdentifier(), where);
     }
 
     // /////////////////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
index c2268d2..b05b038 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
@@ -26,6 +26,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.adapter.ServicesProvider;
@@ -35,6 +36,7 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
+import org.apache.isis.core.metamodel.interactions.CollectionAccessingContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
@@ -81,6 +83,8 @@ public class OneToManyAssociationImplTest {
     @Mock
     private ServicesProvider mockServicesProvider;
     @Mock
+    private IsisConfiguration mockConfiguration;
+    @Mock
     private CollectionAddToFacet mockCollectionAddToFacet;
 
     private OneToManyAssociation association;
@@ -90,7 +94,9 @@ public class OneToManyAssociationImplTest {
         allowingPeerToReturnCollectionType();
         allowingPeerToReturnIdentifier();
         allowingSpecLoaderToReturnSpecs();
-        association = new OneToManyAssociationImpl(mockPeer, new ObjectMemberContext(DeploymentCategory.PRODUCTION, mockAuthenticationSessionProvider, mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter, mockServicesProvider));
+        association = new OneToManyAssociationImpl(mockPeer, new ObjectMemberContext(mockConfiguration,
+                DeploymentCategory.PRODUCTION, mockAuthenticationSessionProvider, mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter, mockServicesProvider
+        ));
     }
 
     private void allowingSpecLoaderToReturnSpecs() {
@@ -119,6 +125,7 @@ public class OneToManyAssociationImplTest {
 
     @Test
     public void canAddPersistable() {
+        final CollectionAccessingContext collectionAccessingContext = null; // TODO
         context.checking(new Expectations() {
             {
                 one(mockPeer).containsFacet(NotPersistedFacet.class);
@@ -133,20 +140,22 @@ public class OneToManyAssociationImplTest {
                 one(mockPeer).getFacet(CollectionAddToFacet.class);
                 will(returnValue(mockCollectionAddToFacet));
 
-                one(mockCollectionAddToFacet).add(mockOwnerAdapter, mockAssociatedAdapter);
+                one(mockCollectionAddToFacet).add(collectionAccessingContext, mockOwnerAdapter, mockAssociatedAdapter);
             }
         });
-        association.addElement(mockOwnerAdapter, mockAssociatedAdapter);
+        association.addElement(collectionAccessingContext, mockOwnerAdapter, mockAssociatedAdapter);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void cannotRemoveNull() {
-        association.removeElement(mockOwnerAdapter, null);
+        final CollectionAccessingContext collectionAccessingContext = null; // TODO
+        association.removeElement(collectionAccessingContext, mockOwnerAdapter, null);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void cannotAddNull() {
-        association.addElement(mockOwnerAdapter, null);
+        final CollectionAccessingContext collectionAccessingContext = null; // TODO
+        association.addElement(collectionAccessingContext, mockOwnerAdapter, null);
     }
 
     private void allowingPeerToReturnCollectionType() {

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
index f490dfc..74b7eec 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
@@ -27,7 +27,9 @@ import org.apache.isis.applib.annotation.ActionSemantics;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.interactions.ActionPromptContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
@@ -136,11 +138,17 @@ public class ObjectActionReprRenderer extends AbstractObjectMemberReprRenderer<O
 
     private ObjectActionReprRenderer addParameterDetails() {
         boolean gsoc2013 = getRendererContext().getConfiguration().getBoolean("isis.viewer.restfulobjects.gsoc2013.legacyParamDetails", false);
+
+        final AuthenticationSession authenticationSession = rendererContext.getAuthenticationSession();
+        final ActionPromptContext actionPromptContext =
+                objectMember.createPromptInteractionContext(
+                        authenticationSession, InteractionInvocationMethod.BY_USER, objectAdapter);
+
         if(gsoc2013) {
             final List<Object> parameters = Lists.newArrayList();
             for (int i = 0; i < objectMember.getParameterCount(); i++) {
                 final ObjectActionParameter param = objectMember.getParameters().get(i);
-                final Object paramDetails = paramDetails(param);
+                final Object paramDetails = paramDetails(param, actionPromptContext);
                 parameters.add(paramDetails);
             }
             representation.mapPut("parameters", parameters);
@@ -148,7 +156,7 @@ public class ObjectActionReprRenderer extends AbstractObjectMemberReprRenderer<O
             final Map<String,Object> parameters = Maps.newLinkedHashMap();
             for (int i = 0; i < objectMember.getParameterCount(); i++) {
                 final ObjectActionParameter param = objectMember.getParameters().get(i);
-                final Object paramDetails = paramDetails(param);
+                final Object paramDetails = paramDetails(param, actionPromptContext);
                 parameters.put(param.getId(), paramDetails);
             }
             representation.mapPut("parameters", parameters);
@@ -156,13 +164,14 @@ public class ObjectActionReprRenderer extends AbstractObjectMemberReprRenderer<O
         return this;
     }
 
-    private Object paramDetails(final ObjectActionParameter param) {
+    private Object paramDetails(final ObjectActionParameter param, final ActionPromptContext promptInteractionContext) {
         final JsonRepresentation paramRep = JsonRepresentation.newMap();
         paramRep.mapPut("num", param.getNumber());
         paramRep.mapPut("id", param.getId());
         paramRep.mapPut("name", param.getName());
         paramRep.mapPut("description", param.getDescription());
-        final Object paramChoices = choicesFor(param);
+
+        final Object paramChoices = choicesFor(param, promptInteractionContext);
         if (paramChoices != null) {
             paramRep.mapPut("choices", paramChoices);
         }
@@ -173,11 +182,14 @@ public class ObjectActionReprRenderer extends AbstractObjectMemberReprRenderer<O
         return paramRep;
     }
 
-    private Object choicesFor(final ObjectActionParameter param) {
+    private Object choicesFor(final ObjectActionParameter param, final ActionPromptContext promptInteractionContext) {
         final AuthenticationSession authenticationSession = rendererContext.getAuthenticationSession();
         final DeploymentType deploymentType = determineDeploymentTypeFrom(rendererContext);
         final DeploymentCategory deploymentCategory = deploymentType.getDeploymentCategory();
-        final ObjectAdapter[] choiceAdapters = param.getChoices(objectAdapter, null, authenticationSession,
+
+        final ActionPromptContext actionPromptContext1 = promptInteractionContext;
+
+        final ObjectAdapter[] choiceAdapters = param.getChoices(actionPromptContext1, objectAdapter, null, authenticationSession,
                 deploymentCategory);
         if (choiceAdapters == null || choiceAdapters.length == 0) {
             return null;

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
index 809fe7f..79a2155 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
@@ -18,13 +18,17 @@ package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
 
 import java.util.List;
 import java.util.Map;
+
 import com.google.common.collect.Lists;
+
 import org.apache.isis.applib.annotation.Render.Type;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.members.render.RenderFacet;
+import org.apache.isis.core.metamodel.interactions.CollectionAccessingContext;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -36,6 +40,8 @@ import org.apache.isis.viewer.restfulobjects.rendering.domaintypes.CollectionDes
 
 public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRenderer<ObjectCollectionReprRenderer, OneToManyAssociation> {
 
+    private final CollectionAccessingContext collectionAccessingContext;
+
     public ObjectCollectionReprRenderer(
             final RendererContext rendererContext) {
         this(rendererContext, null, null, JsonRepresentation.newMap());
@@ -47,6 +53,10 @@ public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRender
             final String collectionId,
             final JsonRepresentation representation) {
         super(rendererContext, linkFollowSpecs, collectionId, RepresentationType.OBJECT_COLLECTION, representation, Where.PARENTED_TABLES);
+
+        collectionAccessingContext = objectMember
+                .createAccessingInteractionContext(getRendererContext().getAuthenticationSession(),
+                        InteractionInvocationMethod.BY_USER, objectAdapter);
     }
 
     @Override
@@ -80,7 +90,8 @@ public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRender
     // ///////////////////////////////////////////////////
 
     private void addValue() {
-        final ObjectAdapter valueAdapter = objectMember.get(objectAdapter);
+
+        final ObjectAdapter valueAdapter = objectMember.get(objectAdapter, collectionAccessingContext);
         if (valueAdapter == null) {
             return;
         }