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 2017/10/16 10:44:26 UTC
[isis] 02/38: ISIS-1742: moves applib.events to
applib.services.wrapper.events
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c2402291a3f69adcb1d1889df4cd1a6a404b05fb
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 12 07:35:11 2017 +0100
ISIS-1742: moves applib.events to applib.services.wrapper.events
---
.../applib/services/wrapper/DisabledException.java | 4 +--
.../applib/services/wrapper/HiddenException.java | 4 +--
.../services/wrapper/InteractionException.java | 2 +-
.../applib/services/wrapper/InvalidException.java | 4 +--
.../applib/services/wrapper/WrapperFactory.java | 2 +-
.../{ => services/wrapper}/events/AccessEvent.java | 2 +-
.../wrapper}/events/ActionArgumentEvent.java | 2 +-
.../wrapper}/events/ActionInvocationEvent.java | 2 +-
.../wrapper}/events/ActionUsabilityEvent.java | 2 +-
.../wrapper}/events/ActionVisibilityEvent.java | 2 +-
.../wrapper}/events/CollectionAccessEvent.java | 2 +-
.../wrapper}/events/CollectionAddToEvent.java | 2 +-
.../wrapper}/events/CollectionMethodEvent.java | 2 +-
.../wrapper}/events/CollectionRemoveFromEvent.java | 2 +-
.../wrapper}/events/CollectionUsabilityEvent.java | 2 +-
.../wrapper}/events/CollectionVisibilityEvent.java | 2 +-
.../wrapper}/events/InteractionEvent.java | 2 +-
.../wrapper}/events/ObjectTitleEvent.java | 2 +-
.../wrapper}/events/ObjectValidityEvent.java | 2 +-
.../wrapper}/events/ObjectVisibilityEvent.java | 2 +-
.../wrapper}/events/ParseValueEvent.java | 2 +-
.../wrapper}/events/PropertyAccessEvent.java | 2 +-
.../wrapper}/events/PropertyModifyEvent.java | 2 +-
.../wrapper}/events/PropertyUsabilityEvent.java | 2 +-
.../wrapper}/events/PropertyVisibilityEvent.java | 2 +-
.../wrapper}/events/ProposedHolderEvent.java | 2 +-
.../wrapper}/events/UsabilityEvent.java | 2 +-
.../wrapper}/events/ValidityEvent.java | 2 +-
.../wrapper}/events/VisibilityEvent.java | 2 +-
.../wrapper}/events/package-info.java | 2 +-
.../wrapper/listeners/InteractionAdapter.java | 32 ++++++++++----------
.../wrapper/listeners/InteractionListener.java | 32 ++++++++++----------
.../isis/applib/events/InteractionEventTest.java | 1 +
.../core/metamodel/consent/InteractionResult.java | 2 +-
.../invocation/ActionDomainEventFacetAbstract.java | 8 ++---
.../notinservicemenu/NotInServiceMenuFacet.java | 2 +-
...viceMenuFacetDerivedFromDomainServiceFacet.java | 2 +-
.../method/NotInServiceMenuFacetViaMethod.java | 2 +-
.../actions/prototype/PrototypeFacetAbstract.java | 2 +-
.../ActionParameterValidationFacetAbstract.java | 2 +-
.../validate/ActionValidationFacetAbstract.java | 2 +-
.../modify/CollectionDomainEventFacetAbstract.java | 6 ++--
.../CollectionValidateAddToFacetAbstract.java | 2 +-
.../CollectionValidateRemoveFromFacetAbstract.java | 2 +-
.../facets/fallback/MaxLengthFacetUnlimited.java | 2 +-
.../members/disabled/DisabledFacetAbstract.java | 2 +-
.../forsession/DisableForSessionFacetAbstract.java | 2 +-
.../method/DisableForContextFacetNone.java | 2 +-
.../method/DisableForContextFacetViaMethod.java | 2 +-
.../facets/members/hidden/HiddenFacetAbstract.java | 2 +-
.../forsession/HideForSessionFacetAbstract.java | 2 +-
.../hidden/method/HideForContextFacetNone.java | 2 +-
.../method/HideForContextFacetViaMethod.java | 2 +-
.../choices/ChoicesFacetFromBoundedAbstract.java | 4 +--
.../disabled/DisabledObjectFacetAbstract.java | 2 +-
.../object/hidden/HiddenObjectFacetAbstract.java | 2 +-
.../hidden/method/HiddenObjectFacetViaMethod.java | 2 +-
.../object/immutable/ImmutableFacetAbstract.java | 2 +-
.../ObjectValidPropertiesFacetAbstract.java | 2 +-
...cationFromMustSatisfyAnnotationOnTypeFacet.java | 2 +-
.../ValidateObjectFacetAbstract.java | 2 +-
.../mandatory/MandatoryFacetAbstract.java | 2 +-
.../objectvalue/maxlen/MaxLengthFacetAbstract.java | 2 +-
.../MustSatisfySpecificationFacetAbstract.java | 2 +-
.../objectvalue/regex/RegExFacetAbstract.java | 2 +-
.../modify/PropertyDomainEventFacetAbstract.java | 6 ++--
.../validating/PropertyValidateFacetAbstract.java | 2 +-
.../dflt/PropertyValidateFacetDefault.java | 2 +-
.../core/metamodel/interactions/AccessContext.java | 2 +-
.../interactions/ActionArgValidityContext.java | 2 +-
.../interactions/ActionUsabilityContext.java | 2 +-
.../interactions/ActionValidityContext.java | 2 +-
.../interactions/ActionVisibilityContext.java | 2 +-
.../interactions/CollectionAccessContext.java | 2 +-
.../interactions/CollectionAddToContext.java | 2 +-
.../interactions/CollectionRemoveFromContext.java | 2 +-
.../interactions/CollectionUsabilityContext.java | 2 +-
.../interactions/CollectionVisibilityContext.java | 2 +-
.../interactions/DisablingInteractionAdvisor.java | 2 +-
.../interactions/HidingInteractionAdvisor.java | 2 +-
.../metamodel/interactions/InteractionContext.java | 2 +-
.../metamodel/interactions/ObjectTitleContext.java | 2 +-
.../interactions/ObjectValidityContext.java | 2 +-
.../interactions/ObjectVisibilityContext.java | 4 +--
.../metamodel/interactions/ParseValueContext.java | 2 +-
.../interactions/PropertyAccessContext.java | 2 +-
.../interactions/PropertyModifyContext.java | 2 +-
.../interactions/PropertyUsabilityContext.java | 2 +-
.../interactions/PropertyVisibilityContext.java | 2 +-
.../metamodel/interactions/UsabilityContext.java | 2 +-
.../interactions/ValidatingInteractionAdvisor.java | 2 +-
.../metamodel/interactions/ValidityContext.java | 2 +-
.../metamodel/interactions/VisibilityContext.java | 2 +-
.../standard/AuthorizationFacetAbstract.java | 4 +--
.../isis/core/wrapper/WrapperFactoryDefault.java | 34 +++++++++++-----------
.../dispatchers/InteractionEventDispatcher.java | 2 +-
.../InteractionEventDispatcherTypeSafe.java | 2 +-
.../AbstractCollectionInvocationHandler.java | 4 +--
.../DelegatingInvocationHandlerDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 14 ++++-----
...FactoryDefaultTest_wrappedObject_transient.java | 6 ++--
101 files changed, 169 insertions(+), 168 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/DisabledException.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/DisabledException.java
index a6ba6b2..6f1fcca 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/DisabledException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/DisabledException.java
@@ -19,8 +19,8 @@
package org.apache.isis.applib.services.wrapper;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
/**
* Superclass of exceptions which indicate an attempt to interact with a class
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/HiddenException.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/HiddenException.java
index ab95cd7..ecfc5af 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/HiddenException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/HiddenException.java
@@ -19,8 +19,8 @@
package org.apache.isis.applib.services.wrapper;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
/**
* Superclass of exceptions which indicate an attempt to interact with a class
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
index a73f3d1..9791f94 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.services.wrapper;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
public abstract class InteractionException extends RecoverableException {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InvalidException.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InvalidException.java
index 494155c..dd0c319 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InvalidException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InvalidException.java
@@ -19,8 +19,8 @@
package org.apache.isis.applib.services.wrapper;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
/**
* Superclass of exceptions which indicate an attempt to interact with an object
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
index 0f22c08..7b2d13e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/AccessEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/AccessEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/AccessEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/AccessEvent.java
index c4034ab..bf6975f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/AccessEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/AccessEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionArgumentEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionArgumentEvent.java
index e497e8d..02d0841 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionArgumentEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ActionInvocationEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ActionInvocationEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
index d23022b..c70628f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ActionInvocationEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ActionUsabilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionUsabilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ActionUsabilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionUsabilityEvent.java
index 772ab3e..dc2bf4d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ActionUsabilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionUsabilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ActionVisibilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ActionVisibilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
index 9e1199a..cacccf8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ActionVisibilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionAccessEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAccessEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/CollectionAccessEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAccessEvent.java
index f3e5aab..6ea290c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionAccessEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAccessEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionAddToEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAddToEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/CollectionAddToEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAddToEvent.java
index 3de08ce..381a19e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionAddToEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionAddToEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionMethodEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionMethodEvent.java
similarity index 98%
rename from core/applib/src/main/java/org/apache/isis/applib/events/CollectionMethodEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionMethodEvent.java
index be57bb1..9afdf12 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionMethodEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionMethodEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionRemoveFromEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionRemoveFromEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/CollectionRemoveFromEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionRemoveFromEvent.java
index d1372aa..db70d26 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionRemoveFromEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionRemoveFromEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionUsabilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionUsabilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/CollectionUsabilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionUsabilityEvent.java
index 1b0fe6d..57c8a9c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionUsabilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionUsabilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionVisibilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionVisibilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/CollectionVisibilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionVisibilityEvent.java
index cb0dabc..f38b1f3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/CollectionVisibilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/CollectionVisibilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
similarity index 99%
rename from core/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
index 7905d6d..cb5b35a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import java.util.EventObject;
import java.util.List;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ObjectTitleEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectTitleEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ObjectTitleEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectTitleEvent.java
index b25f855..5a3675f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ObjectTitleEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectTitleEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ObjectValidityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectValidityEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ObjectValidityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectValidityEvent.java
index 0068b1c..1d8e2c5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ObjectValidityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectValidityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ObjectVisibilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectVisibilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ObjectVisibilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectVisibilityEvent.java
index 59ca9db..cc0569e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ObjectVisibilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ObjectVisibilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ParseValueEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ParseValueEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ParseValueEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ParseValueEvent.java
index 3bafcaa..2220777 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ParseValueEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ParseValueEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/PropertyAccessEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyAccessEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/PropertyAccessEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyAccessEvent.java
index 06d9f8c..0d9036f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/PropertyAccessEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyAccessEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/PropertyModifyEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyModifyEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/PropertyModifyEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyModifyEvent.java
index 51ef377..89598bb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/PropertyModifyEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyModifyEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/PropertyUsabilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyUsabilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/PropertyUsabilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyUsabilityEvent.java
index f4a8593..c1b6726 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/PropertyUsabilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyUsabilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/PropertyVisibilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyVisibilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/PropertyVisibilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyVisibilityEvent.java
index a0b538d..10f5435 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/PropertyVisibilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/PropertyVisibilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ProposedHolderEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ProposedHolderEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ProposedHolderEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ProposedHolderEvent.java
index 292cc72..d75270c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ProposedHolderEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ProposedHolderEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
/**
* <i>Supported only by {@link org.apache.isis.applib.services.wrapper.WrapperFactory} service, </i> makes it easier to process different events that hold a single proposed
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/UsabilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/UsabilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/UsabilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/UsabilityEvent.java
index 0e6e6b6..76b1fc4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/UsabilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/UsabilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ValidityEvent.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ValidityEvent.java
index a50ad88..25162e0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ValidityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/VisibilityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/events/VisibilityEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
index 06908e6..92558e0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/VisibilityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events;
+package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/package-info.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/applib/events/package-info.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/package-info.java
index bae4930..903da7a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/package-info.java
@@ -23,4 +23,4 @@
*
* @see <a href="http://isis.apache.org/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory">Reference Guide</a>
*/
-package org.apache.isis.applib.events;
\ No newline at end of file
+package org.apache.isis.applib.services.wrapper.events;
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionAdapter.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionAdapter.java
index f43a129..8cd899f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionAdapter.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionAdapter.java
@@ -19,22 +19,22 @@
package org.apache.isis.applib.services.wrapper.listeners;
-import org.apache.isis.applib.events.ActionArgumentEvent;
-import org.apache.isis.applib.events.ActionInvocationEvent;
-import org.apache.isis.applib.events.ActionUsabilityEvent;
-import org.apache.isis.applib.events.ActionVisibilityEvent;
-import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.applib.events.CollectionAddToEvent;
-import org.apache.isis.applib.events.CollectionMethodEvent;
-import org.apache.isis.applib.events.CollectionRemoveFromEvent;
-import org.apache.isis.applib.events.CollectionUsabilityEvent;
-import org.apache.isis.applib.events.CollectionVisibilityEvent;
-import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.applib.events.ObjectValidityEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.applib.events.PropertyModifyEvent;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionArgumentEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionInvocationEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAddToEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionMethodEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionRemoveFromEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectTitleEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
/**
* Provides no-op implementations of each of the methods within
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionListener.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionListener.java
index 10c8c36..7680c3d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionListener.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/listeners/InteractionListener.java
@@ -19,22 +19,22 @@
package org.apache.isis.applib.services.wrapper.listeners;
-import org.apache.isis.applib.events.ActionArgumentEvent;
-import org.apache.isis.applib.events.ActionInvocationEvent;
-import org.apache.isis.applib.events.ActionUsabilityEvent;
-import org.apache.isis.applib.events.ActionVisibilityEvent;
-import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.applib.events.CollectionAddToEvent;
-import org.apache.isis.applib.events.CollectionMethodEvent;
-import org.apache.isis.applib.events.CollectionRemoveFromEvent;
-import org.apache.isis.applib.events.CollectionUsabilityEvent;
-import org.apache.isis.applib.events.CollectionVisibilityEvent;
-import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.applib.events.ObjectValidityEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.applib.events.PropertyModifyEvent;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionArgumentEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionInvocationEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAddToEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionMethodEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionRemoveFromEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectTitleEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
public interface InteractionListener {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java b/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
index 1a6bf3d..dbcc1bf 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
@RunWith(JMock.class)
public class InteractionEventTest {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
index 774afb7..bc1ab4f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
public class InteractionResult {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
index 4399084..066b440 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
@@ -21,10 +21,10 @@ package org.apache.isis.core.metamodel.facets.actions.action.invocation;
import java.util.Map;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/NotInServiceMenuFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/NotInServiceMenuFacet.java
index 1aeae15..e9a92b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/NotInServiceMenuFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/NotInServiceMenuFacet.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.notinservicemenu;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java
index 27ab5ec..1830eeb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacetAbstract;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
index 98edfed..34d04be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.method;
import java.lang.reflect.Method;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
index 0375662..25a9e86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.prototype;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionParameterValidationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionParameterValidationFacetAbstract.java
index 75bde80..25661be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionParameterValidationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionParameterValidationFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.validate;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java
index 0c89b87..daf44cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.validate;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
index 75c227a..c801e45 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
@@ -19,9 +19,9 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
-import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java
index 439c2ea..976accc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.collections.validate;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java
index 5666d4f..1bd106e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.collections.validate;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/MaxLengthFacetUnlimited.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/MaxLengthFacetUnlimited.java
index 95d6b2f..e9e23b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/MaxLengthFacetUnlimited.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/MaxLengthFacetUnlimited.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.fallback;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacetAbstract;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
index 15bb6a3..44a9f1a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.members.disabled;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java
index eaac187..6bbb013 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.members.disabled.forsession;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
index 782411a..fa0d51c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.members.disabled.method;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
index 103834d..8a5f15d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index 83280f1..ac12ab0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.members.hidden;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java
index 759f925..8ad205b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.members.hidden.forsession;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
index 3999f83..eac9761 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.members.hidden.method;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
index 7214e8f..b77eb3c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
index a7b675d..3d80bb8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
@@ -23,8 +23,8 @@ import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryFindAllInstances;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java
index 42431e4..383e3e7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.object.disabled;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenObjectFacetAbstract.java
index cd6d3e4..b6bcf41 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenObjectFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.hidden;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
index 2deea6f..da646b6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.hidden.method;
import java.lang.reflect.Method;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
index d9f5ab2..b134337 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.immutable;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/ObjectValidPropertiesFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/ObjectValidPropertiesFacetAbstract.java
index 5833b85..8e26cd4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/ObjectValidPropertiesFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/ObjectValidPropertiesFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.objectvalidprops;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java
index a9fa87e..c3de14a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.validating.mustsatisfyspec;
import java.util.List;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ValidateObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ValidateObjectFacetAbstract.java
index 7e873c4..d00ec1a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ValidateObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ValidateObjectFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.validating.validateobject;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
index 06bc7e3..982d243 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.objectvalue.mandatory;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
index 871f053..13640be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.objectvalue.maxlen;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
index 1e98748..773caa0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.mustsatisfyspec;
import java.util.List;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/RegExFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/RegExFacetAbstract.java
index ca125eb..be39570 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/RegExFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/RegExFacetAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.regex;
import javax.validation.constraints.Pattern;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
index 14080bf..0f83465 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
@@ -19,9 +19,9 @@
package org.apache.isis.core.metamodel.facets.properties.property.modify;
-import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
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..dcab725 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
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.properties.validating;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefault.java
index 56a70a5..3faa33f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefault.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.properties.validating.dflt;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
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 ff1653f..f5d43fb 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
@@ -20,7 +20,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.applib.services.wrapper.events.AccessEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
index 10e5244..0d9a458 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
@@ -20,7 +20,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.applib.services.wrapper.events.ActionArgumentEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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 144d3f7..b0f17ce 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
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.ActionUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionUsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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
index 3a7902a..3fab1bf 100644
--- 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
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ActionInvocationEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionInvocationEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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 9c9b774..e448710 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
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.ActionVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionVisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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
index d8e55a1..b0b0cf0 100644
--- 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
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAccessEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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
index c75dd4d..841f6d7 100644
--- 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
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionAddToEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAddToEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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
index d6cba32..d332434 100644
--- 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
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionRemoveFromEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionRemoveFromEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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 e7916df..d5765b1 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
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.CollectionUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionUsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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 927d402..f2d1107 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
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.CollectionVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionVisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java
index 4b51b22..5163b7d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract.Disabling;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
index 3bd9640..4027789 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract.Hiding;
/**
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 0e7cf0d..e94d742 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
@@ -24,7 +24,7 @@ import java.util.Map;
import com.google.common.collect.ImmutableMap;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
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 ac4eeb6..dc38c3c 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
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ObjectTitleEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectTitleEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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 ac8178e..87b6046 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
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ObjectValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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 42ae62f..bf4cc30 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
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.ObjectVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectVisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -30,7 +30,7 @@ import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
/**
* See {@link org.apache.isis.core.metamodel.interactions.InteractionContext} for overview; analogous to
- * {@link org.apache.isis.applib.events.ObjectVisibilityEvent}.
+ * {@link ObjectVisibilityEvent}.
*/
public class ObjectVisibilityContext extends VisibilityContext<ObjectVisibilityEvent> implements ProposedHolder {
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 be0c1ce..88454b7 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
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ParseValueEvent;
+import org.apache.isis.applib.services.wrapper.events.ParseValueEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
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
index a2bff2a..6d514e1 100644
--- 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
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.PropertyAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
index 3205852..acf7f60 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.PropertyModifyEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
index 4701619..d7d2fe5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
index 365eb8f..7fe71f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
index bdcf8d3..119694a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
index 3ee4ad6..3768ac8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract.Validating;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
index ea4e17d..195635b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
index b264cf1..7e58b2f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
index d257e4f..2e693b5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
@@ -19,8 +19,8 @@
package org.apache.isis.core.runtime.authorization.standard;
-import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index 7390b5e..04d0270 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -28,23 +28,23 @@ import java.util.Map;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.events.ActionArgumentEvent;
-import org.apache.isis.applib.events.ActionInvocationEvent;
-import org.apache.isis.applib.events.ActionUsabilityEvent;
-import org.apache.isis.applib.events.ActionVisibilityEvent;
-import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.applib.events.CollectionAddToEvent;
-import org.apache.isis.applib.events.CollectionMethodEvent;
-import org.apache.isis.applib.events.CollectionRemoveFromEvent;
-import org.apache.isis.applib.events.CollectionUsabilityEvent;
-import org.apache.isis.applib.events.CollectionVisibilityEvent;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.applib.events.ObjectValidityEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.applib.events.PropertyModifyEvent;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionArgumentEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionInvocationEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ActionVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAddToEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionMethodEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionRemoveFromEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectTitleEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcher.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcher.java
index 2dfa70c..058c0c5 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcher.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcher.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.wrapper.dispatchers;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
public interface InteractionEventDispatcher {
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
index c568633..02ef324 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.wrapper.dispatchers;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
public abstract class InteractionEventDispatcherTypeSafe<T extends InteractionEvent> implements InteractionEventDispatcher {
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
index d9d65aa..352a43b 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
@@ -24,8 +24,8 @@ import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.events.CollectionMethodEvent;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionMethodEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
abstract class AbstractCollectionInvocationHandler<T, C> extends DelegatingInvocationHandlerDefault<C> {
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index 1e7e181..ffaf8ed 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index 766fe01..c3624e9 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -35,13 +35,13 @@ import com.google.common.collect.Sets;
import org.datanucleus.enhancement.Persistable;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.CollectionAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+import org.apache.isis.applib.services.wrapper.events.ObjectTitleEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
+import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
+import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InteractionException;
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 2b2e3d5..cf89c4e 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -33,9 +33,9 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.PropertyModifyEvent;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
+import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.