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:08 UTC

[08/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/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java
index 856c1cf..0496a95 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java
@@ -26,6 +26,7 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 
 public class PropertyClearFacetViaSetterMethod extends PropertyClearFacetAbstract implements ImperativeFacet {
 
@@ -61,8 +62,10 @@ public class PropertyClearFacetViaSetterMethod extends PropertyClearFacetAbstrac
     }
 
     @Override
-    public void clearProperty(final ObjectAdapter owningAdapter) {
-        ObjectAdapter.InvokeUtils.invoke(method, owningAdapter);
+    public void clearProperty(
+            final PropertyAccessingContext propertyAccessingContext,
+            final ObjectAdapter targetAdapter) {
+        ObjectAdapter.InvokeUtils.invoke(method, targetAdapter);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacet.java
index 99fddd3..478aab0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacet.java
@@ -22,6 +22,7 @@ package org.apache.isis.core.metamodel.facets.properties.update.modify;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 
 /**
  * The mechanism by which the value of the property can be set.
@@ -39,5 +40,8 @@ public interface PropertySetterFacet extends Facet {
     /**
      * Sets the value of this property.
      */
-    public void setProperty(ObjectAdapter inObject, ObjectAdapter value);
+    public void setProperty(
+            final PropertyAccessingContext propertyAccessingContext,
+            final ObjectAdapter inObject,
+            final ObjectAdapter value);
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaModifyMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaModifyMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaModifyMethod.java
index be89691..efa0f23 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaModifyMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaModifyMethod.java
@@ -29,6 +29,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
 
 public class PropertySetterFacetViaModifyMethod extends PropertySetterFacetAbstract implements ImperativeFacet {
@@ -67,7 +68,9 @@ public class PropertySetterFacetViaModifyMethod extends PropertySetterFacetAbstr
     }
 
     @Override
-    public void setProperty(final ObjectAdapter targetAdapter, final ObjectAdapter valueAdapter) {
+    public void setProperty(
+            final PropertyAccessingContext propertyAccessingContext, final ObjectAdapter targetAdapter,
+            final ObjectAdapter valueAdapter) {
 
         final CommandContext commandContext = getServicesInjector().lookupService(CommandContext.class);
         final Command command;

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java
index fd7d7d5..60bf6e9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java
@@ -26,6 +26,7 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessingContext;
 
 public class PropertySetterFacetViaSetterMethod extends PropertySetterFacetAbstract implements ImperativeFacet {
 
@@ -61,7 +62,9 @@ public class PropertySetterFacetViaSetterMethod extends PropertySetterFacetAbstr
     }
 
     @Override
-    public void setProperty(final ObjectAdapter adapter, final ObjectAdapter valueAdapter) {
+    public void setProperty(
+            final PropertyAccessingContext propertyAccessingContext, final ObjectAdapter adapter,
+            final ObjectAdapter valueAdapter) {
         ObjectAdapter.InvokeUtils.invoke(method, adapter, valueAdapter);
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
index 54f6cc4..0fee076 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
-import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
+import org.apache.isis.core.metamodel.interactions.PropertyValidityContext;
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
 
 public abstract class PropertyValidateFacetAbstract extends FacetAbstract implements PropertyValidateFacet {
@@ -40,11 +40,11 @@ public abstract class PropertyValidateFacetAbstract extends FacetAbstract implem
 
     @Override
     public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
-        if (!(context instanceof PropertyModifyContext)) {
+        if (!(context instanceof PropertyValidityContext)) {
             return null;
         }
-        final PropertyModifyContext propertyModifyContext = (PropertyModifyContext) context;
-        ObjectAdapter proposed = propertyModifyContext.getProposed();
+        final PropertyValidityContext propertyValidityContext = (PropertyValidityContext) context;
+        ObjectAdapter proposed = propertyValidityContext.getProposed();
         if(proposed == null) {
             // skip validation if null value and optional property.
             MandatoryFacet mandatoryFacet = getFacetHolder().getFacet(MandatoryFacet.class);
@@ -52,6 +52,6 @@ public abstract class PropertyValidateFacetAbstract extends FacetAbstract implem
                 return null;
             }
         }
-        return invalidReason(propertyModifyContext.getTarget(), proposed);
+        return invalidReason(propertyValidityContext.getTarget(), proposed);
     }
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
index 71a9d41..cd196fb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
@@ -22,6 +22,7 @@ package org.apache.isis.core.metamodel.interactions;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.AccessEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
@@ -33,8 +34,15 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
  */
 public abstract class AccessContext<T extends AccessEvent> extends InteractionContext<T> {
 
-    public AccessContext(final InteractionContextType interactionType, DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final Identifier identifier, final ObjectAdapter target) {
-        super(interactionType, deploymentCategory, session, invocationMethod, identifier, target);
+    public AccessContext(
+            final InteractionContextType interactionType,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final Identifier identifier,
+            final ObjectAdapter target) {
+        super(interactionType, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
index e6b66cb..ea031b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
@@ -22,6 +22,7 @@ package org.apache.isis.core.metamodel.interactions;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ActionArgumentEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
@@ -38,8 +39,16 @@ public class ActionArgumentContext extends ValidityContext<ActionArgumentEvent>
     private final int position;
     private final ObjectAdapter proposed;
 
-    public ActionArgumentContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id, final ObjectAdapter[] args, final int position) {
-        super(InteractionContextType.ACTION_PROPOSED_ARGUMENT, deploymentCategory, session, invocationMethod, id, target);
+    public ActionArgumentContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier id,
+            final ObjectAdapter[] args,
+            final int position) {
+        super(InteractionContextType.ACTION_PROPOSED_ARGUMENT, isisConfiguration, deploymentCategory, session, invocationMethod, id, target);
 
         this.args = args;
         this.position = position;

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionExecutingContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionExecutingContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionExecutingContext.java
new file mode 100644
index 0000000..cf19b0f
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionExecutingContext.java
@@ -0,0 +1,71 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ActionExecutingEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionImpl;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
+/**
+ * See {@link InteractionContext} for overview; analogous to
+ * {@link ActionExecutingEvent}.
+ */
+public class ActionExecutingContext extends AccessContext<ActionExecutingEvent> {
+
+    private final ObjectActionImpl action;
+    private final ObjectAdapter[] args;
+
+    public ActionExecutingContext(
+            final ObjectActionImpl action,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier id,
+            final ObjectAdapter[] args) {
+        super(InteractionContextType.ACTION_INVOKE, isisConfiguration, deploymentCategory, session, invocationMethod, id, target);
+        this.action = action;
+        this.args = args;
+    }
+
+    public ObjectAction getAction() {
+        return action;
+    }
+
+    public ObjectAdapter[] getArgs() {
+        return args;
+    }
+
+    @Override
+    public ActionExecutingEvent createInteractionEvent() {
+        return new ActionExecutingEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()));
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
deleted file mode 100644
index 85a4a3c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.metamodel.interactions;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ActionInvocationEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionContextType;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-/**
- * See {@link InteractionContext} for overview; analogous to
- * {@link ActionInvocationEvent}.
- */
-public class ActionInvocationContext extends ValidityContext<ActionInvocationEvent> {
-
-    private final ObjectAdapter[] args;
-
-    public ActionInvocationContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id, final ObjectAdapter[] args) {
-        super(InteractionContextType.ACTION_INVOKE, deploymentCategory, session, invocationMethod, id, target);
-        this.args = args;
-    }
-
-    public ObjectAdapter[] getArgs() {
-        return args;
-    }
-
-    @Override
-    public ActionInvocationEvent createInteractionEvent() {
-        return new ActionInvocationEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionPromptContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionPromptContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionPromptContext.java
new file mode 100644
index 0000000..56c2519
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionPromptContext.java
@@ -0,0 +1,57 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.AccessEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+
+public class ActionPromptContext extends AccessContext<AccessEvent> {
+
+    private final ObjectAction action;
+
+    public ActionPromptContext(
+            final ObjectAction action,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier id) {
+        super(InteractionContextType.ACTION_INVOKE, isisConfiguration, deploymentCategory, session, invocationMethod, id, target);
+        this.action = action;
+    }
+
+    public ObjectAction getAction() {
+        return action;
+    }
+
+    @Override
+    public AccessEvent createInteractionEvent() {
+        throw new RuntimeException("Not supported");
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
index 0dbe4dd..826159f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
@@ -23,6 +23,7 @@ import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.events.ActionUsabilityEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
@@ -35,8 +36,15 @@ import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
  */
 public class ActionUsabilityContext extends UsabilityContext<ActionUsabilityEvent> {
 
-    public ActionUsabilityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id, Where where) {
-        super(InteractionContextType.ACTION_USABLE, deploymentCategory, session, invocationMethod, id, target, where);
+    public ActionUsabilityContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier id,
+            final Where where) {
+        super(InteractionContextType.ACTION_USABLE, isisConfiguration, deploymentCategory, session, invocationMethod, id, target, where);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
new file mode 100644
index 0000000..fa87e70
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
@@ -0,0 +1,70 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ActionInvocationEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
+/**
+ * See {@link InteractionContext} for overview; analogous to
+ * {@link ActionInvocationEvent}.
+ */
+public class ActionValidityContext extends ValidityContext<ActionInvocationEvent> {
+
+    private final ObjectAction action;
+    private final ObjectAdapter[] args;
+
+    public ActionValidityContext(
+            final ObjectAction action,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier id,
+            final ObjectAdapter[] args) {
+        super(InteractionContextType.ACTION_INVOKE, isisConfiguration, deploymentCategory, session, invocationMethod, id, target);
+        this.action = action;
+        this.args = args;
+    }
+
+    public ObjectAction getAction() {
+        return action;
+    }
+
+    public ObjectAdapter[] getArgs() {
+        return args;
+    }
+
+    @Override
+    public ActionInvocationEvent createInteractionEvent() {
+        return new ActionInvocationEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()));
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
index 941e0b4..6d7ec45 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
@@ -23,6 +23,7 @@ import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.events.ActionVisibilityEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
@@ -36,8 +37,15 @@ import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
  */
 public class ActionVisibilityContext extends VisibilityContext<ActionVisibilityEvent> {
 
-    public ActionVisibilityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier, Where where) {
-        super(InteractionContextType.ACTION_VISIBLE, deploymentCategory, session, invocationMethod, identifier, target, where);
+    public ActionVisibilityContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier identifier,
+            Where where) {
+        super(InteractionContextType.ACTION_VISIBLE, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target, where);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AssociationAccessingContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AssociationAccessingContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AssociationAccessingContext.java
new file mode 100644
index 0000000..fc39766
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AssociationAccessingContext.java
@@ -0,0 +1,45 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.AccessEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
+public abstract class AssociationAccessingContext<T extends AccessEvent> extends AccessContext<T> {
+
+    public AssociationAccessingContext(
+            final InteractionContextType interactionContextType,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final Identifier identifier,
+            final ObjectAdapter target) {
+        super(interactionContextType, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target);
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
deleted file mode 100644
index 2efdb1a..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.metamodel.interactions;
-
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionContextType;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-
-/**
- * See {@link InteractionContext} for overview; analogous to
- * {@link CollectionAccessEvent}.
- */
-public class CollectionAccessContext extends AccessContext<CollectionAccessEvent> {
-
-    public CollectionAccessContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier) {
-        super(InteractionContextType.COLLECTION_READ, deploymentCategory, session, invocationMethod, identifier, target);
-    }
-
-    @Override
-    public CollectionAccessEvent createInteractionEvent() {
-        return new CollectionAccessEvent(unwrap(getTarget()), getIdentifier());
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessedContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessedContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessedContext.java
new file mode 100644
index 0000000..73d60e2
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessedContext.java
@@ -0,0 +1,54 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionAccessEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
+/**
+ * See {@link InteractionContext} for overview; analogous to
+ * {@link CollectionAccessEvent}.
+ */
+public class CollectionAccessedContext extends AccessContext<CollectionAccessEvent> {
+
+    public CollectionAccessedContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier identifier) {
+        super(InteractionContextType.COLLECTION_READ, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target);
+    }
+
+    @Override
+    public CollectionAccessEvent createInteractionEvent() {
+        return new CollectionAccessEvent(unwrap(getTarget()), getIdentifier());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessingContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessingContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessingContext.java
new file mode 100644
index 0000000..9164d66
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessingContext.java
@@ -0,0 +1,63 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionAccessingEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
+/**
+ * See {@link InteractionContext} for overview; analogous to
+ * {@link CollectionAccessingEvent}.
+ */
+public class CollectionAccessingContext extends AssociationAccessingContext<CollectionAccessingEvent> {
+
+    private final OneToManyAssociation collection;
+
+    public CollectionAccessingContext(
+            final OneToManyAssociation collection,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final Identifier identifier,
+            final ObjectAdapter target) {
+        super(InteractionContextType.COLLECTION_READ, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target);
+        this.collection = collection;
+    }
+
+    public OneToManyAssociation getCollection() {
+        return collection;
+    }
+
+    @Override
+    public CollectionAccessingEvent createInteractionEvent() {
+        return new CollectionAccessingEvent(unwrap(getTarget()), getIdentifier());
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
deleted file mode 100644
index ae4dc63..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.metamodel.interactions;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionAddToEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionContextType;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-
-/**
- * See {@link InteractionContext} for overview; analogous to
- * {@link CollectionAddToEvent}.
- */
-public class CollectionAddToContext extends ValidityContext<CollectionAddToEvent> implements ProposedHolder {
-
-    private final ObjectAdapter proposed;
-
-    public CollectionAddToContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id, final ObjectAdapter proposed) {
-        super(InteractionContextType.COLLECTION_ADD_TO, deploymentCategory, session, invocationMethod, id, target);
-
-        this.proposed = proposed;
-    }
-
-    @Override
-    public ObjectAdapter getProposed() {
-        return proposed;
-    }
-
-    @Override
-    public CollectionAddToEvent createInteractionEvent() {
-        return new CollectionAddToEvent(ObjectAdapter.Util.unwrap(getTarget()), getIdentifier(), ObjectAdapter.Util.unwrap(getProposed()));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
deleted file mode 100644
index 2c0ee1c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.metamodel.interactions;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionRemoveFromEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionContextType;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-/**
- * See {@link InteractionContext} for overview; analogous to
- * {@link CollectionRemoveFromEvent}.
- */
-public class CollectionRemoveFromContext extends ValidityContext<CollectionRemoveFromEvent> implements ProposedHolder{
-
-    private final ObjectAdapter proposed;
-
-    public CollectionRemoveFromContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier, final ObjectAdapter proposed) {
-        super(InteractionContextType.COLLECTION_REMOVE_FROM, deploymentCategory, session, invocationMethod, identifier, target);
-
-        this.proposed = proposed;
-    }
-
-    @Override
-    public ObjectAdapter getProposed() {
-        return proposed;
-    }
-
-    @Override
-    public CollectionRemoveFromEvent createInteractionEvent() {
-        return new CollectionRemoveFromEvent(unwrap(getTarget()), getIdentifier(), unwrap(getProposed()));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
index ed45d1a..d0cf505 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
@@ -23,6 +23,7 @@ import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.events.CollectionUsabilityEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
@@ -34,8 +35,15 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
  */
 public class CollectionUsabilityContext extends UsabilityContext<CollectionUsabilityEvent> {
 
-    public CollectionUsabilityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier, Where where) {
-        super(InteractionContextType.COLLECTION_USABLE, deploymentCategory, session, invocationMethod, identifier, target, where);
+    public CollectionUsabilityContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier identifier,
+            Where where) {
+        super(InteractionContextType.COLLECTION_USABLE, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target, where);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionValidityAddToContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionValidityAddToContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionValidityAddToContext.java
new file mode 100644
index 0000000..d411384
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionValidityAddToContext.java
@@ -0,0 +1,70 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionAddToEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+
+/**
+ * See {@link InteractionContext} for overview; analogous to
+ * {@link CollectionAddToEvent}.
+ */
+public class CollectionValidityAddToContext extends ValidityContext<CollectionAddToEvent> implements ProposedHolder {
+
+    private final OneToManyAssociation collection;
+    private final ObjectAdapter proposed;
+
+    public CollectionValidityAddToContext(
+            final OneToManyAssociation collection,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier id,
+            final ObjectAdapter proposed) {
+        super(InteractionContextType.COLLECTION_ADD_TO, isisConfiguration, deploymentCategory, session, invocationMethod, id, target);
+        this.collection = collection;
+
+        this.proposed = proposed;
+    }
+
+    public OneToManyAssociation getCollection() {
+        return collection;
+    }
+
+    @Override
+    public ObjectAdapter getProposed() {
+        return proposed;
+    }
+
+    @Override
+    public CollectionAddToEvent createInteractionEvent() {
+        return new CollectionAddToEvent(ObjectAdapter.Util.unwrap(getTarget()), getIdentifier(), ObjectAdapter.Util.unwrap(getProposed()));
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionValidityRemoveFromContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionValidityRemoveFromContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionValidityRemoveFromContext.java
new file mode 100644
index 0000000..9794cff
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionValidityRemoveFromContext.java
@@ -0,0 +1,72 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionRemoveFromEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
+/**
+ * See {@link InteractionContext} for overview; analogous to
+ * {@link CollectionRemoveFromEvent}.
+ */
+public class CollectionValidityRemoveFromContext extends ValidityContext<CollectionRemoveFromEvent> implements ProposedHolder{
+
+    private final OneToManyAssociation oneToManyAssociation;
+    private final ObjectAdapter proposed;
+
+    public CollectionValidityRemoveFromContext(
+            final OneToManyAssociation collection,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier identifier,
+            final ObjectAdapter proposed) {
+        super(InteractionContextType.COLLECTION_REMOVE_FROM, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target);
+        this.oneToManyAssociation = collection;
+
+        this.proposed = proposed;
+    }
+
+    public OneToManyAssociation getCollection() {
+        return oneToManyAssociation;
+    }
+
+    @Override
+    public ObjectAdapter getProposed() {
+        return proposed;
+    }
+
+    @Override
+    public CollectionRemoveFromEvent createInteractionEvent() {
+        return new CollectionRemoveFromEvent(unwrap(getTarget()), getIdentifier(), unwrap(getProposed()));
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
index 41b7fb7..4c1c057 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
@@ -19,26 +19,33 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.events.CollectionVisibilityEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
 
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
 /**
  * See {@link InteractionContext} for overview; analogous to
  * {@link CollectionVisibilityEvent}.
  */
 public class CollectionVisibilityContext extends VisibilityContext<CollectionVisibilityEvent> {
 
-    public CollectionVisibilityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier, Where where) {
-        super(InteractionContextType.COLLECTION_VISIBLE, deploymentCategory, session, invocationMethod, identifier, target, where);
+    public CollectionVisibilityContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier identifier,
+            Where where) {
+        super(InteractionContextType.COLLECTION_VISIBLE, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target, where);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
index 3e4ff01..3b2f3e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
@@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableMap;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.InteractionEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
@@ -62,6 +63,7 @@ public abstract class InteractionContext<T extends InteractionEvent> {
 
     private final InteractionContextType interactionType;
     private final Identifier identifier;
+    private final IsisConfiguration isisConfiguration;
     private final InteractionInvocationMethod invocation;
     private final AuthenticationSession session;
     private final ObjectAdapter target;
@@ -70,8 +72,16 @@ public abstract class InteractionContext<T extends InteractionEvent> {
     private int contributeeParam = -1; // no contributee
     private ObjectAdapter contributee = null;
 
-    public InteractionContext(final InteractionContextType interactionType, DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final Identifier identifier, final ObjectAdapter target) {
+    public InteractionContext(
+            final InteractionContextType interactionType,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final Identifier identifier,
+            final ObjectAdapter target) {
         this.interactionType = interactionType;
+        this.isisConfiguration = isisConfiguration;
         this.invocation = invocationMethod;
         this.identifier = identifier;
         this.session = session;
@@ -79,6 +89,10 @@ public abstract class InteractionContext<T extends InteractionEvent> {
         this.deploymentCategory = deploymentCategory;
     }
 
+    public IsisConfiguration getConfiguration() {
+        return isisConfiguration;
+    }
+
     public DeploymentCategory getDeploymentCategory() {
         return deploymentCategory;
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
index f54c90b..e8697cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
@@ -19,17 +19,17 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ObjectTitleEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
 
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
 /**
  * See {@link InteractionContext} for overview; analogous to
  * {@link ObjectTitleEvent}.
@@ -38,8 +38,15 @@ public class ObjectTitleContext extends AccessContext<ObjectTitleEvent> {
 
     private final String title;
 
-    public ObjectTitleContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier, final String title) {
-        super(InteractionContextType.OBJECT_TITLE, deploymentCategory, session, invocationMethod, identifier, target);
+    public ObjectTitleContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier identifier,
+            final String title) {
+        super(InteractionContextType.OBJECT_TITLE, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target);
         this.title = title;
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
index a2d34f8..9ab44a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
@@ -19,25 +19,31 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ObjectValidityEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
 
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
 /**
  * See {@link InteractionContext} for overview; analogous to
  * {@link ObjectValidityEvent}.
  */
 public class ObjectValidityContext extends ValidityContext<ObjectValidityEvent> implements ProposedHolder {
 
-    public ObjectValidityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier) {
-        super(InteractionContextType.OBJECT_VALIDATE, deploymentCategory, session, invocationMethod, identifier, target);
+    public ObjectValidityContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier identifier) {
+        super(InteractionContextType.OBJECT_VALIDATE, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
index 60640b1..f5da1b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
@@ -23,6 +23,7 @@ import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.events.ObjectVisibilityEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
@@ -37,13 +38,14 @@ import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
 public class ObjectVisibilityContext extends VisibilityContext<ObjectVisibilityEvent> implements ProposedHolder {
 
     public ObjectVisibilityContext(
+            final IsisConfiguration isisConfiguration,
             final DeploymentCategory deploymentCategory,
             final AuthenticationSession session,
             final InteractionInvocationMethod invocationMethod,
             final ObjectAdapter target,
             final Identifier identifier,
             final Where where) {
-        super(InteractionContextType.OBJECT_VISIBILITY, deploymentCategory, session, invocationMethod, identifier, target, where);
+        super(InteractionContextType.OBJECT_VISIBILITY, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target, where);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParameterAccessingContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParameterAccessingContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParameterAccessingContext.java
new file mode 100644
index 0000000..b770081
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParameterAccessingContext.java
@@ -0,0 +1,61 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.AccessEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+
+/**
+ * See {@link InteractionContext} for the act of accessing a parameter.
+ */
+public class ParameterAccessingContext extends AccessContext<AccessEvent> {
+
+    private final ObjectActionParameter parameter;
+
+    public ParameterAccessingContext(
+            final ObjectActionParameter parameter,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final Identifier id,
+            final ObjectAdapter target) {
+        super(InteractionContextType.PROPERTY_READ, isisConfiguration, deploymentCategory, session, invocationMethod, id, target);
+
+        this.parameter = parameter;
+    }
+
+    public ObjectActionParameter getParameter() {
+        return parameter;
+    }
+
+    @Override
+    public AccessEvent createInteractionEvent() {
+        throw new RuntimeException("not supported");
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
index 60a01ad..049024b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
@@ -19,17 +19,17 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ParseValueEvent;
 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.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
 
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
 /**
  * See {@link InteractionContext} for overview; analogous to
  * {@link ParseValueEvent}.
@@ -38,8 +38,15 @@ public class ParseValueContext extends ValidityContext<ParseValueEvent> implemen
 
     private final ObjectAdapter proposed;
 
-    public ParseValueContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier, final ObjectAdapter proposed) {
-        super(InteractionContextType.PARSE_VALUE, deploymentCategory, session, invocationMethod, identifier, target);
+    public ParseValueContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier identifier,
+            final ObjectAdapter proposed) {
+        super(InteractionContextType.PARSE_VALUE, isisConfiguration, deploymentCategory, session, invocationMethod, identifier, target);
         this.proposed = proposed;
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
deleted file mode 100644
index 4dafe1c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.metamodel.interactions;
-
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionContextType;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-
-/**
- * See {@link InteractionContext} for overview; analogous to
- * {@link PropertyAccessEvent}.
- */
-public class PropertyAccessContext extends AccessContext<PropertyAccessEvent> {
-
-    private final ObjectAdapter value;
-
-    public PropertyAccessContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id, final ObjectAdapter value) {
-        super(InteractionContextType.PROPERTY_READ, deploymentCategory, session, invocationMethod, id, target);
-
-        this.value = value;
-    }
-
-    /**
-     * The current value for a property.
-     */
-    public ObjectAdapter getValue() {
-        return value;
-    }
-
-    @Override
-    public PropertyAccessEvent createInteractionEvent() {
-        return new PropertyAccessEvent(unwrap(getTarget()), getIdentifier(), unwrap(getValue()));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessedContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessedContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessedContext.java
new file mode 100644
index 0000000..c2f9de0
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessedContext.java
@@ -0,0 +1,66 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.PropertyAccessEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
+/**
+ * See {@link InteractionContext} for overview; analogous to
+ * {@link PropertyAccessEvent}.
+ */
+public class PropertyAccessedContext extends AccessContext<PropertyAccessEvent> {
+
+    private final ObjectAdapter value;
+
+    public PropertyAccessedContext(
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final ObjectAdapter target,
+            final Identifier id,
+            final ObjectAdapter value) {
+        super(InteractionContextType.PROPERTY_READ, isisConfiguration, deploymentCategory, session, invocationMethod, id, target);
+
+        this.value = value;
+    }
+
+    /**
+     * The current value for a property.
+     */
+    public ObjectAdapter getValue() {
+        return value;
+    }
+
+    @Override
+    public PropertyAccessEvent createInteractionEvent() {
+        return new PropertyAccessEvent(unwrap(getTarget()), getIdentifier(), unwrap(getValue()));
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/4ac11bbc/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessingContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessingContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessingContext.java
new file mode 100644
index 0000000..79857c2
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessingContext.java
@@ -0,0 +1,62 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.interactions;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.PropertyAccessingEvent;
+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.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+
+/**
+ * See {@link InteractionContext} for the act of accessing a property; analogous to
+ * {@link PropertyAccessingEvent}.
+ */
+public class PropertyAccessingContext extends AssociationAccessingContext<PropertyAccessingEvent> {
+
+    private final OneToOneAssociation property;
+
+    public PropertyAccessingContext(
+            final OneToOneAssociation property,
+            final IsisConfiguration isisConfiguration,
+            final DeploymentCategory deploymentCategory,
+            final AuthenticationSession session,
+            final InteractionInvocationMethod invocationMethod,
+            final Identifier id, final ObjectAdapter target) {
+        super(InteractionContextType.PROPERTY_READ, isisConfiguration, deploymentCategory, session, invocationMethod, id, target);
+        this.property = property;
+    }
+
+    public OneToOneAssociation getProperty() {
+        return property;
+    }
+
+    @Override
+    public PropertyAccessingEvent createInteractionEvent() {
+        return new PropertyAccessingEvent(unwrap(getTarget()), getIdentifier());
+    }
+
+}