This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9982bd635cda428dc7e012e9776fa874d42b93de
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Mon May 11 07:19:39 2020 +0200
ISIS-2340: rename package f. managed interaction stuff
---
.../managed}/ActionInteraction.java | 4 ++--
.../managed}/CollectionInteraction.java | 4 ++--
.../managed}/InteractionVeto.java | 4 ++--
.../managed}/ManagedAction.java | 2 +-
.../managed}/ManagedCollection.java | 2 +-
.../managed}/ManagedMember.java | 2 +-
.../managed}/ManagedParameter.java | 2 +-
.../managed}/ManagedParameterList.java | 2 +-
.../managed}/ManagedProperty.java | 2 +-
.../managed}/MemberInteraction.java | 2 +-
.../managed}/PropertyInteraction.java | 4 ++--
.../incubator/viewer/vaadin/ui/binding/BinderUtil.java | 2 +-
.../vaadin/ui/components/collection/TableView.java | 2 +-
.../vaadin/ui/components/object/ObjectFormView.java | 8 ++++----
.../viewer/common/model/binding/UiComponentFactory.java | 6 +++---
.../domainobjects/AbstractObjectMemberReprRenderer.java | 2 +-
.../domainobjects/DomainObjectReprRenderer.java | 6 +++---
.../domainobjects/ObjectActionReprRenderer.java | 2 +-
.../domainobjects/ObjectAndActionInvocation.java | 2 +-
.../domainobjects/ObjectCollectionReprRenderer.java | 2 +-
.../domainobjects/ObjectPropertyReprRenderer.java | 2 +-
.../rendering/service/RepresentationService.java | 6 +++---
.../service/RepresentationServiceContentNegotiator.java | 6 +++---
.../service/conneg/ContentNegotiationService.java | 6 +++---
.../conneg/ContentNegotiationServiceAbstract.java | 6 +++---
.../ContentNegotiationServiceForRestfulObjectsV1_0.java | 6 +++---
.../conneg/ContentNegotiationServiceOrgApacheIsisV1.java | 6 +++---
.../viewer/resources/DomainObjectResourceServerside.java | 6 +++---
.../viewer/resources/DomainResourceHelper.java | 12 ++++++------
.../viewer/resources/InteractionFailureHandler.java | 4 ++--
.../viewer/resources/ObjectActionArgHelper.java | 2 +-
.../viewer/resources/ObjectAdapterAccessHelper.java | 16 ++++++++--------
.../viewer/wicket/model/models/ScalarParameterModel.java | 2 +-
33 files changed, 71 insertions(+), 71 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ActionInteraction.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
similarity index 97%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ActionInteraction.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
index 107a9b8..df1428d 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ActionInteraction.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.function.Function;
@@ -24,8 +24,8 @@ import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Either;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import
org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import
org.apache.isis.core.metamodel.spec.interaction.ManagedMember.MemberType;
import lombok.Data;
import lombok.NonNull;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/CollectionInteraction.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
similarity index 93%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/CollectionInteraction.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
index 8b84f98..6a3cf3f 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/CollectionInteraction.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import org.apache.isis.core.commons.internal.base._Either;
+import
org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import
org.apache.isis.core.metamodel.spec.interaction.ManagedMember.MemberType;
import lombok.NonNull;
import lombok.val;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/InteractionVeto.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/InteractionVeto.java
similarity index 95%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/InteractionVeto.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/InteractionVeto.java
index 547afc5..cde9ca6 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/InteractionVeto.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/InteractionVeto.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.io.Serializable;
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.Veto;
-import
org.apache.isis.core.metamodel.spec.interaction.ManagedMember.MemberType;
+import
org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import lombok.AccessLevel;
import lombok.Getter;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedAction.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedAction.java
similarity index 97%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedAction.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedAction.java
index b965e24..bcf7838 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedAction.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedAction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedCollection.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedCollection.java
similarity index 97%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedCollection.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedCollection.java
index b0bd23b..51f2305 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedCollection.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedMember.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
similarity index 98%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedMember.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
index 417b2bf..d561b90 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedMember.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.BiFunction;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedParameter.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameter.java
similarity index 97%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedParameter.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameter.java
index a8f6d33..dd01bd8 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedParameter.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedParameterList.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameterList.java
similarity index 97%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedParameterList.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameterList.java
index 0d3943e..8f19c46 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedParameterList.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameterList.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Iterator;
import java.util.Optional;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedProperty.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
similarity index 98%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedProperty.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
index 76e68ac..d435bba 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ManagedProperty.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/MemberInteraction.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
similarity index 98%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/MemberInteraction.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
index 8612cbb..04b6d46 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/MemberInteraction.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.Function;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/PropertyInteraction.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
similarity index 93%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/PropertyInteraction.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
index c9d2548..224447f 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/PropertyInteraction.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec.interaction;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.function.Function;
import org.apache.isis.core.commons.internal.base._Either;
+import
org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import
org.apache.isis.core.metamodel.spec.interaction.ManagedMember.MemberType;
import lombok.NonNull;
import lombok.val;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java
index 7a7efc0..c33ceca 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java
@@ -30,7 +30,7 @@ import com.vaadin.flow.data.converter.Converter;
import com.vaadin.flow.data.converter.DateToSqlDateConverter;
import com.vaadin.flow.data.converter.LocalDateToDateConverter;
-import org.apache.isis.core.metamodel.spec.interaction.InteractionVeto;
+import org.apache.isis.core.metamodel.interactions.managed.InteractionVeto;
import org.apache.isis.viewer.common.model.binding.UiComponentFactory.Request;
import lombok.RequiredArgsConstructor;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/collection/TableView.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/collection/TableView.java
index be05900..e824a79 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/collection/TableView.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/collection/TableView.java
@@ -31,11 +31,11 @@ import
com.vaadin.flow.component.orderedlayout.VerticalLayout;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectFormView.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectFormView.java
index 0667714..37e2957 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectFormView.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectFormView.java
@@ -46,11 +46,11 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3Col;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Row;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Tab;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
+import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction;
+import
org.apache.isis.core.metamodel.interactions.managed.CollectionInteraction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.interaction.ActionInteraction;
-import org.apache.isis.core.metamodel.spec.interaction.CollectionInteraction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.PropertyInteraction;
import
org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa;
import
org.apache.isis.incubator.viewer.vaadin.ui.components.collection.TableView;
import org.apache.isis.viewer.common.model.binding.UiComponentFactory;
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/UiComponentFactory.java
b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/UiComponentFactory.java
index c210c26..55beade 100644
---
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/UiComponentFactory.java
+++
b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/UiComponentFactory.java
@@ -26,11 +26,11 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.handler.ChainOfResponsibility;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.interactions.managed.InteractionVeto;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedMember;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.interaction.InteractionVeto;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedMember;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import lombok.NonNull;
import lombok.Value;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
index 0f85c27..97dd891 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
@@ -24,11 +24,11 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedMember;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedMember;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index 31c5f99..344e4e6 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -26,6 +26,9 @@ import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.core.metamodel.consent.Consent;
import
org.apache.isis.core.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -34,9 +37,6 @@ import
org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
index af97025..6aceb0e 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
@@ -28,10 +28,10 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
index e2b3bd5..05c0879 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
@@ -21,10 +21,10 @@ package
org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.interaction.ActionInteraction;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ActionResultRepresentation;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
index c2f8ab8..4899258 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
@@ -27,9 +27,9 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
import
org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index f981823..9068da9 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -33,8 +33,8 @@ import
org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import
org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueFacet;
import
org.apache.isis.core.metamodel.facets.value.biginteger.BigIntegerValueFacet;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
index 4f6d777..04c43a7 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
@@ -20,10 +20,10 @@ package
org.apache.isis.viewer.restfulobjects.rendering.service;
import javax.ws.rs.core.Response;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import
org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndActionInvocation;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
index bd0b518..ab29629 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
@@ -32,10 +32,10 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import
org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndActionInvocation;
import
org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationService;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
index cf89440..de96ca4 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
@@ -20,10 +20,10 @@ package
org.apache.isis.viewer.restfulobjects.rendering.service.conneg;
import javax.ws.rs.core.Response;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import
org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndActionInvocation;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
index 4029775..c09ea9b 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
@@ -28,10 +28,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.factory.InstanceUtil;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import
org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 2a7bf8b..579e8b1 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -38,11 +38,11 @@ import org.apache.isis.applib.domain.DomainObjectList;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
index 4c8229b..f18ae75 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
@@ -36,13 +36,13 @@ import org.apache.isis.applib.client.SuppressionType;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ActionResultRepresentation;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
diff --git
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index dc8f0ee..9e557fa 100644
---
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -55,12 +55,12 @@ import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedMember;
+import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
+import
org.apache.isis.core.metamodel.interactions.managed.MemberInteraction.AccessIntent;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedMember;
-import
org.apache.isis.core.metamodel.spec.interaction.MemberInteraction.AccessIntent;
-import org.apache.isis.core.metamodel.spec.interaction.PropertyInteraction;
import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
diff --git
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
index caf13c9..755ff51 100644
---
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
+++
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
@@ -22,13 +22,13 @@ import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction;
+import org.apache.isis.core.metamodel.interactions.managed.InteractionVeto;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedMember;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedParameter;
+import
org.apache.isis.core.metamodel.interactions.managed.ActionInteraction.SemanticConstraint;
+import
org.apache.isis.core.metamodel.interactions.managed.MemberInteraction.AccessIntent;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.interaction.ActionInteraction;
-import org.apache.isis.core.metamodel.spec.interaction.InteractionVeto;
-import
org.apache.isis.core.metamodel.spec.interaction.ActionInteraction.SemanticConstraint;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedMember;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedParameter;
-import
org.apache.isis.core.metamodel.spec.interaction.MemberInteraction.AccessIntent;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import
org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ActionResultReprRenderer;
diff --git
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/InteractionFailureHandler.java
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/InteractionFailureHandler.java
index c40b22d..2a81a72 100644
---
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/InteractionFailureHandler.java
+++
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/InteractionFailureHandler.java
@@ -20,8 +20,8 @@ package
org.apache.isis.viewer.restfulobjects.viewer.resources;
import javax.annotation.Nullable;
-import org.apache.isis.core.metamodel.spec.interaction.InteractionVeto;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedParameter;
+import org.apache.isis.core.metamodel.interactions.managed.InteractionVeto;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedParameter;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
import
org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
index b2224a9..a49e21d 100644
---
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
+++
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
@@ -26,11 +26,11 @@ import
org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
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;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
diff --git
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
index 7dc6bfa..1f9423c 100644
---
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
+++
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
@@ -19,15 +19,15 @@
package org.apache.isis.viewer.restfulobjects.viewer.resources;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction;
+import
org.apache.isis.core.metamodel.interactions.managed.CollectionInteraction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
+import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
+import
org.apache.isis.core.metamodel.interactions.managed.ActionInteraction.SemanticConstraint;
+import
org.apache.isis.core.metamodel.interactions.managed.MemberInteraction.AccessIntent;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.interaction.ActionInteraction;
-import
org.apache.isis.core.metamodel.spec.interaction.ActionInteraction.SemanticConstraint;
-import org.apache.isis.core.metamodel.spec.interaction.CollectionInteraction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedAction;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedCollection;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedProperty;
-import
org.apache.isis.core.metamodel.spec.interaction.MemberInteraction.AccessIntent;
-import org.apache.isis.core.metamodel.spec.interaction.PropertyInteraction;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import lombok.NonNull;
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
index 2548a27..a59dd99 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
@@ -26,11 +26,11 @@ import
org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedParameter;
import org.apache.isis.core.metamodel.spec.ManagedObject;
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;
-import org.apache.isis.core.metamodel.spec.interaction.ManagedParameter;
import
org.apache.isis.core.metamodel.specloader.specimpl.PendingParameterModel;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.common.model.feature.ParameterUiModel;
