This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 3fe58f3 ISIS-1680 applib: reorganizing event classes into new packages
3fe58f3 is described below
commit 3fe58f366d7d58385ced2393810886b791729a2b
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Apr 12 14:23:44 2018 +0200
ISIS-1680 applib: reorganizing event classes into new packages
---
.../org/apache/isis/applib/IsisApplibModule.java | 12 +++++-----
.../org/apache/isis/applib/annotation/Action.java | 4 ++--
.../apache/isis/applib/annotation/Collection.java | 4 ++--
.../isis/applib/annotation/DomainObject.java | 28 +++++++++++-----------
.../isis/applib/annotation/DomainObjectLayout.java | 6 ++---
.../apache/isis/applib/annotation/Property.java | 4 ++--
.../domain}/AbstractDomainEvent.java | 10 ++++----
.../domain}/ActionDomainEvent.java | 4 ++--
.../domain}/CollectionDomainEvent.java | 8 +++----
.../domain}/PropertyDomainEvent.java | 10 ++++----
.../lifecycle}/AbstractLifecycleEvent.java | 2 +-
.../lifecycle}/ObjectCreatedEvent.java | 2 +-
.../lifecycle}/ObjectLoadedEvent.java | 2 +-
.../lifecycle}/ObjectPersistedEvent.java | 2 +-
.../lifecycle}/ObjectPersistingEvent.java | 2 +-
.../lifecycle}/ObjectRemovingEvent.java | 2 +-
.../lifecycle}/ObjectUpdatedEvent.java | 2 +-
.../lifecycle}/ObjectUpdatingEvent.java | 2 +-
.../eventbus => events/ui}/AbstractUiEvent.java | 2 +-
.../eventbus => events/ui}/CssClassUiEvent.java | 2 +-
.../eventbus => events/ui}/IconUiEvent.java | 2 +-
.../eventbus => events/ui}/TitleUiEvent.java | 2 +-
.../isis/applib/services/command/Command.java | 2 +-
.../applib/services/command/CommandDefault.java | 2 +-
.../services/eventbus/EventBusImplementation.java | 5 ++--
.../isis/applib/services/iactn/Interaction.java | 10 ++++----
.../command/CommandContractTestAbstract.java | 3 +--
.../eventbus/AbstractDomainEvent_veto_Test.java | 2 +-
.../core/metamodel/facets/DomainEventHelper.java | 8 +++----
.../action/ActionAnnotationFacetFactory.java | 2 +-
.../invocation/ActionDomainEventFacetAbstract.java | 4 ++--
.../invocation/ActionDomainEventFacetDefault.java | 2 +-
.../ActionDomainEventFacetForActionAnnotation.java | 2 +-
...ctionInvocationFacetForDomainEventAbstract.java | 4 ++--
...ionFacetForDomainEventFromActionAnnotation.java | 2 +-
...onInvocationFacetForDomainEventFromDefault.java | 2 +-
.../CollectionAnnotationFacetFactory.java | 2 +-
...ectionAddToFacetForDomainEventFromAbstract.java | 5 ++--
...acetForDomainEventFromCollectionAnnotation.java | 2 +-
...lectionAddToFacetForDomainEventFromDefault.java | 2 +-
.../modify/CollectionDomainEventFacetAbstract.java | 4 ++--
.../modify/CollectionDomainEventFacetDefault.java | 2 +-
...ionDomainEventFacetForCollectionAnnotation.java | 2 +-
...nRemoveFromFacetForDomainEventFromAbstract.java | 5 ++--
...acetForDomainEventFromCollectionAnnotation.java | 2 +-
...onRemoveFromFacetForDomainEventFromDefault.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 4 ++--
.../object/callbacks/LifecycleEventFacet.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
...fecycleEventFacetForDomainObjectAnnotation.java | 2 +-
.../DomainObjectAnnotationFacetFactory.java | 14 +++++------
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 2 +-
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 2 +-
.../property/PropertyAnnotationFacetFactory.java | 2 +-
...ropertyClearFacetForDomainEventFromDefault.java | 2 +-
...rFacetForDomainEventFromPropertyAnnotation.java | 2 +-
.../modify/PropertyDomainEventFacetAbstract.java | 4 ++--
.../modify/PropertyDomainEventFacetDefault.java | 2 +-
...pertyDomainEventFacetForPropertyAnnotation.java | 2 +-
...opertySetterFacetForDomainEventFromDefault.java | 2 +-
...rFacetForDomainEventFromPropertyAnnotation.java | 2 +-
...tySetterOrClearFacetForDomainEventAbstract.java | 4 ++--
...nEventHelperTest_newActionInteractionEvent.java | 2 +-
...HelperTest_newCollectionDomainEvent_forAdd.java | 4 ++--
...perTest_newCollectionDomainEvent_forRemove.java | 4 ++--
...HelperTest_newPropertyDomainEvent_forClear.java | 2 +-
...elperTest_newPropertyDomainEvent_forModify.java | 2 +-
.../action/ActionAnnotationFacetFactoryTest.java | 2 +-
.../CollectionAnnotationFacetFactoryTest.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 2 +-
.../EventBusImplementationForAxonSimple.java | 2 +-
.../adapter/EventBusImplementationForGuava.java | 2 +-
.../system/persistence/PersistenceSession4.java | 2 +-
.../system/persistence/PersistenceSession5.java | 2 +-
.../services/ServicesInstallerFromAnnotation.java | 6 ++---
.../eventbus/EventBusImplementationAbstract.java | 3 +--
.../wicket/viewer/services/Object_clearHints.java | 2 +-
.../domainapp/modules/simple/SimpleModule.java | 6 ++---
.../modules/simple/dom/impl/SimpleObjects.java | 2 +-
84 files changed, 150 insertions(+), 149 deletions(-)
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index 4724939..9b0b3b5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -26,26 +26,26 @@ public class IsisApplibModule extends ModuleAbstract {
// -- ui event classes
@SuppressWarnings("serial") // serial versionId to be provided by concrete
class
public abstract static class TitleUiEvent<S>
- extends org.apache.isis.applib.services.eventbus.TitleUiEvent<S> {
}
+ extends org.apache.isis.applib.events.ui.TitleUiEvent<S> { }
@SuppressWarnings("serial") // serial versionId to be provided by concrete
class
public abstract static class IconUiEvent<S>
- extends org.apache.isis.applib.services.eventbus.IconUiEvent<S> { }
+ extends org.apache.isis.applib.events.ui.IconUiEvent<S> { }
@SuppressWarnings("serial") // serial versionId to be provided by concrete
class
public abstract static class CssClassUiEvent<S>
- extends
org.apache.isis.applib.services.eventbus.CssClassUiEvent<S> { }
+ extends org.apache.isis.applib.events.ui.CssClassUiEvent<S> { }
// -- domain event classes
@SuppressWarnings("serial") // serial versionId to be provided by concrete
class
- public abstract static class ActionDomainEvent<S> extends
org.apache.isis.applib.services.eventbus.ActionDomainEvent<S> {
+ public abstract static class ActionDomainEvent<S> extends
org.apache.isis.applib.events.domain.ActionDomainEvent<S> {
}
@SuppressWarnings("serial") // serial versionId to be provided by concrete
class
- public abstract static class CollectionDomainEvent<S,T> extends
org.apache.isis.applib.services.eventbus.CollectionDomainEvent<S,T> {
+ public abstract static class CollectionDomainEvent<S,T> extends
org.apache.isis.applib.events.domain.CollectionDomainEvent<S,T> {
}
@SuppressWarnings("serial") // serial versionId to be provided by concrete
class
- public abstract static class PropertyDomainEvent<S,T> extends
org.apache.isis.applib.services.eventbus.PropertyDomainEvent<S,T> {
+ public abstract static class PropertyDomainEvent<S,T> extends
org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {
}
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
index 118b83d..6a8bb57 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
@@ -27,10 +27,10 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.conmap.ContentMappingServiceForCommandDto;
import org.apache.isis.applib.conmap.ContentMappingServiceForCommandsDto;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.applib.services.command.spi.CommandService;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
/**
* Domain semantics for domain object collection.
@@ -44,7 +44,7 @@ public @interface Action {
/**
* Indicates that an invocation of the action should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.ActionDomainEvent}.
+ * {@link org.apache.isis.applib.events.domain.ActionDomainEvent}.
*
* <p>For example:
* </p>
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
index 36b9fca..978e179 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.jdo.annotations.NotPersistent;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
/**
* Domain semantics for domain object collection.
@@ -40,7 +40,7 @@ public @interface Collection {
/**
* Indicates that changes to the collection that should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.CollectionDomainEvent}.
+ * {@link org.apache.isis.applib.events.domain.CollectionDomainEvent}.
*
* <p>For example:
* </p>
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
index c2dd5d3..e56af53 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
@@ -24,13 +24,13 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.services.eventbus.ObjectCreatedEvent;
-import org.apache.isis.applib.services.eventbus.ObjectLoadedEvent;
-import org.apache.isis.applib.services.eventbus.ObjectPersistedEvent;
-import org.apache.isis.applib.services.eventbus.ObjectPersistingEvent;
-import org.apache.isis.applib.services.eventbus.ObjectRemovingEvent;
-import org.apache.isis.applib.services.eventbus.ObjectUpdatedEvent;
-import org.apache.isis.applib.services.eventbus.ObjectUpdatingEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectCreatedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectLoadedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectPersistedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectPersistingEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent;
/**
* Domain semantics for domain objects (entities and view models; for services
see {@link org.apache.isis.applib.annotation.DomainService}).
@@ -164,7 +164,7 @@ public @interface DomainObject {
/**
* Indicates that the loading of the domain object should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.ObjectCreatedEvent}.
+ * {@link org.apache.isis.applib.events.lifecycle.ObjectCreatedEvent}.
*
* <p>
* This subclass must provide a no-arg constructor; the fields are set
reflectively.
@@ -175,7 +175,7 @@ public @interface DomainObject {
/**
* Indicates that the loading of the domain object should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.ObjectPersistingEvent}.
+ * {@link org.apache.isis.applib.events.lifecycle.ObjectPersistingEvent}.
*
* <p>
* This subclass must provide a no-arg constructor; the fields are set
reflectively.
@@ -186,7 +186,7 @@ public @interface DomainObject {
/**
* Indicates that the loading of the domain object should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.ObjectPersistedEvent}.
+ * {@link org.apache.isis.applib.events.lifecycle.ObjectPersistedEvent}.
*
* <p>
* This subclass must provide a no-arg constructor; the fields are set
reflectively.
@@ -197,7 +197,7 @@ public @interface DomainObject {
/**
* Indicates that the loading of the domain object should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.ObjectLoadedEvent}.
+ * {@link org.apache.isis.applib.events.lifecycle.ObjectLoadedEvent}.
*
* <p>
* This subclass must provide a no-arg constructor; the fields are set
reflectively.
@@ -208,7 +208,7 @@ public @interface DomainObject {
/**
* Indicates that the loading of the domain object should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.ObjectUpdatingEvent}.
+ * {@link org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent}.
*
* <p>
* This subclass must provide a no-arg constructor; the fields are set
reflectively.
@@ -219,7 +219,7 @@ public @interface DomainObject {
/**
* Indicates that the loading of the domain object should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.ObjectUpdatedEvent}.
+ * {@link org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent}.
*
* <p>
* This subclass must provide a no-arg constructor; the fields are set
reflectively.
@@ -231,7 +231,7 @@ public @interface DomainObject {
/**
* Indicates that the loading of the domain object should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.ObjectRemovingEvent}.
+ * {@link org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent}.
*
* <p>
* This subclass must provide a no-arg constructor; the fields are set
reflectively.
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
index d0ffd85..e4a467f 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
@@ -25,9 +25,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.services.eventbus.CssClassUiEvent;
-import org.apache.isis.applib.services.eventbus.IconUiEvent;
-import org.apache.isis.applib.services.eventbus.TitleUiEvent;
+import org.apache.isis.applib.events.ui.CssClassUiEvent;
+import org.apache.isis.applib.events.ui.IconUiEvent;
+import org.apache.isis.applib.events.ui.TitleUiEvent;
/**
* Layout hints for domain objects.
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index 4ec8d78..76745c9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -29,10 +29,10 @@ import javax.jdo.annotations.NotPersistent;
import org.apache.isis.applib.conmap.ContentMappingServiceForCommandDto;
import org.apache.isis.applib.conmap.ContentMappingServiceForCommandsDto;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.applib.services.command.spi.CommandService;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
@@ -48,7 +48,7 @@ public @interface Property {
/**
* Indicates that changes to the property that should be posted to the
* {@link org.apache.isis.applib.services.eventbus.EventBusService event
bus} using a custom (subclass of)
- * {@link org.apache.isis.applib.services.eventbus.PropertyDomainEvent}.
+ * {@link org.apache.isis.applib.events.domain.PropertyDomainEvent}.
*
* <p>For example:
* </p>
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
similarity index 96%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
index e7b1744..2af8347 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.domain;
import java.util.EventObject;
import java.util.Map;
@@ -73,8 +73,8 @@ public abstract class AbstractDomainEvent<S> extends
java.util.EventObject {
}
/**
- * When the {@link org.apache.isis.applib.services.command.Command} is
made available on the {@link
org.apache.isis.applib.services.eventbus.ActionDomainEvent}
- * via {@link
org.apache.isis.applib.services.eventbus.ActionDomainEvent#getCommand()}.
+ * When the {@link org.apache.isis.applib.services.command.Command} is
made available on the {@link
org.apache.isis.applib.events.domain.ActionDomainEvent}
+ * via {@link
org.apache.isis.applib.events.domain.ActionDomainEvent#getCommand()}.
*/
public boolean isExecutingOrLater() {
return isExecuting() || isExecuted();
@@ -238,7 +238,7 @@ public abstract class AbstractDomainEvent<S> extends
java.util.EventObject {
* If hiding, just pass <tt>null</tt> for the parameter.
* </p>
*
- * @param reason - reason why the interaction is being invalidated
(ignored if in {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#HIDE hide}
phase).
+ * @param reason - reason why the interaction is being invalidated
(ignored if in {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#HIDE hide}
phase).
* @param args
*
* @see #veto(org.apache.isis.applib.services.i18n.TranslatableString)
@@ -276,7 +276,7 @@ public abstract class AbstractDomainEvent<S> extends
java.util.EventObject {
* If hiding, just pass <tt>null</tt> for the parameter.
* </p>
*
- * @param translatableReason - reason why the interaction is being
invalidated (ignored if in {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#HIDE hide}
phase).
+ * @param translatableReason - reason why the interaction is being
invalidated (ignored if in {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#HIDE hide}
phase).
*
* @see #veto(String, Object...)
*/
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
similarity index 98%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
index a70e0ff..cbce11c 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/domain/ActionDomainEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.domain;
import java.util.List;
@@ -188,7 +188,7 @@ public abstract class ActionDomainEvent<S> extends
AbstractDomainEvent<S> {
* The value returned by the action.
*
* <p>
- * Only available for the {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#EXECUTED}
+ * Only available for the {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#EXECUTED}
* {@link #getEventPhase() phase}.
* </p>
*/
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
similarity index 90%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
index eb24294..b7d581d 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/domain/CollectionDomainEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.domain;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
@@ -78,8 +78,8 @@ public abstract class CollectionDomainEvent<S,T> extends
AbstractDomainEvent<S>
private T value;
/**
- * The proposed reference to either add or remove (per {@link #getOf()}),
populated at {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#VALIDATE}
- * and subsequent phases (is null for {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#HIDE hidden}
and {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#DISABLE
disable} phases).
+ * The proposed reference to either add or remove (per {@link #getOf()}),
populated at {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#VALIDATE}
+ * and subsequent phases (is null for {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#HIDE hidden} and
{@link org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#DISABLE
disable} phases).
*/
public T getValue() {
return value;
@@ -122,7 +122,7 @@ public abstract class CollectionDomainEvent<S,T> extends
AbstractDomainEvent<S>
/**
* Not API; updates from {@link Of#ACCESS} to either {@link Of#ADD_TO} or
{@link Of#REMOVE_FROM} when hits the
- * {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#VALIDATE
validation phase}.
+ * {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#VALIDATE
validation phase}.
*/
public void setOf(Of of) {
this.of = of;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
similarity index 84%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
index 0c83178..bb3db8c 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/domain/PropertyDomainEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.domain;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
@@ -76,8 +76,8 @@ public abstract class PropertyDomainEvent<S,T> extends
AbstractDomainEvent<S> {
private T oldValue;
/**
- * The current (pre-modification) value of the property; populated at
{@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#VALIDATE}
and subsequent phases
- * (but null for {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#HIDE hidden}
and {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#DISABLE
disable} phases).
+ * The current (pre-modification) value of the property; populated at
{@link org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#VALIDATE}
and subsequent phases
+ * (but null for {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#HIDE hidden} and
{@link org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#DISABLE
disable} phases).
*/
public T getOldValue() {
return oldValue;
@@ -93,8 +93,8 @@ public abstract class PropertyDomainEvent<S,T> extends
AbstractDomainEvent<S> {
// -- newValue
private T newValue;
/**
- * The proposed (post-modification) value of the property; populated at
{@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#VALIDATE}
and subsequent phases
- * (but null for {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#HIDE hidden}
and {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#DISABLE
disable} phases).
+ * The proposed (post-modification) value of the property; populated at
{@link org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#VALIDATE}
and subsequent phases
+ * (but null for {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#HIDE hidden} and
{@link org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#DISABLE
disable} phases).
*/
public T getNewValue() {
return newValue;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractLifecycleEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/AbstractLifecycleEvent.java
similarity index 97%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractLifecycleEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/AbstractLifecycleEvent.java
index b2e3321..5244a75 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractLifecycleEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/AbstractLifecycleEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.lifecycle;
import java.util.EventObject;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectCreatedEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
similarity index 97%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectCreatedEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
index 42470e9..bed4749 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectCreatedEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectCreatedEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.lifecycle;
public abstract class ObjectCreatedEvent<S> extends AbstractLifecycleEvent<S> {
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectLoadedEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
similarity index 97%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectLoadedEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
index 6225ed8..5e3c12e 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectLoadedEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectLoadedEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.lifecycle;
public abstract class ObjectLoadedEvent<S> extends AbstractLifecycleEvent<S> {
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistedEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
similarity index 97%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistedEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
index 91ce262..0cb4cfd 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistedEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistedEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.lifecycle;
public abstract class ObjectPersistedEvent<S> extends
AbstractLifecycleEvent<S> {
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistingEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
similarity index 97%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistingEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
index aabbc4f..a337c75 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistingEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectPersistingEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.lifecycle;
public abstract class ObjectPersistingEvent<S> extends
AbstractLifecycleEvent<S> {
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectRemovingEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
similarity index 97%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectRemovingEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
index 4026100..e2539c0 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectRemovingEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectRemovingEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.lifecycle;
public abstract class ObjectRemovingEvent<S> extends AbstractLifecycleEvent<S>
{
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatedEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
similarity index 97%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatedEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
index 280e5b0..aa80fed 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatedEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatedEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.lifecycle;
public abstract class ObjectUpdatedEvent<S> extends AbstractLifecycleEvent<S> {
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatingEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
similarity index 97%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatingEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
index 71fa3ae..aa4b12c 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatingEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/lifecycle/ObjectUpdatingEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.lifecycle;
public abstract class ObjectUpdatingEvent<S> extends AbstractLifecycleEvent<S>
{
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractUiEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
similarity index 98%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractUiEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
index 6fa8626..274ab7f 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractUiEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.ui;
import java.util.EventObject;
import java.util.Map;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
similarity index 98%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
index 124e62f..b04f27d 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/ui/CssClassUiEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.ui;
import java.util.EventObject;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
similarity index 98%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
index 4a36013..81b8a74 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.ui;
import java.util.EventObject;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
b/core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
similarity index 98%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
rename to
core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
index e7a3bb8..85f1f0a 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.eventbus;
+package org.apache.isis.applib.events.ui;
import java.util.EventObject;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index 7044491..8332a33 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -25,12 +25,12 @@ import org.apache.isis.applib.annotation.CommandExecuteIn;
import org.apache.isis.applib.annotation.CommandPersistence;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.clock.Clock;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.background.BackgroundCommandService;
import org.apache.isis.applib.services.background.BackgroundService;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
index ddf332f..de62c9b 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
@@ -27,10 +27,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.isis.applib.annotation.CommandExecuteIn;
import org.apache.isis.applib.annotation.CommandPersistence;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.internal.collections._Lists;
import org.apache.isis.applib.internal.collections._Maps;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusImplementation.java
b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusImplementation.java
index 0f2fb9e..6423a49 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusImplementation.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusImplementation.java
@@ -22,8 +22,9 @@ import org.apache.isis.applib.internal.context._Plugin;
* Common interface for all Event Bus implementations.
*
* <p>
- * Defines an (non-pluggable, hard-coded) SPI to the {@link
org.apache.isis.applib.services.eventbus.EventBusService},
- * to allow alternativeimplementations of in-memory event bus to be used.
+ * Defines an (non-pluggable, hard-coded) SPI to the
+ * {@link org.apache.isis.applib.services.eventbus.EventBusService},
+ * to allow alternative implementations of in-memory event bus to be used.
* </p>
*
* <p>
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index de1bf0c..e9ce3b5 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -29,15 +29,15 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Value;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.internal.collections._Lists;
import org.apache.isis.applib.internal.collections._Maps;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.Transaction;
@@ -199,7 +199,7 @@ public class Interaction implements HasTransactionId {
* <b>NOT API</b>: intended to be called only by the framework.
*
* <p>
- * Push a new {@link
org.apache.isis.applib.services.eventbus.AbstractDomainEvent}
+ * Push a new {@link
org.apache.isis.applib.events.domain.AbstractDomainEvent}
* onto the stack of events held by the command.
* </p>
*/
@@ -226,7 +226,7 @@ public class Interaction implements HasTransactionId {
* <b>NOT API</b>: intended to be called only by the framework.
*
* <p>
- * Pops the top-most {@link
org.apache.isis.applib.services.eventbus.ActionDomainEvent}
+ * Pops the top-most {@link
org.apache.isis.applib.events.domain.ActionDomainEvent}
* from the stack of events held by the command.
* </p>
*/
diff --git
a/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandContractTestAbstract.java
b/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandContractTestAbstract.java
index 169ee59..3fee447 100644
---
a/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandContractTestAbstract.java
+++
b/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandContractTestAbstract.java
@@ -20,11 +20,10 @@ package org.apache.isis.applib.services.command;
import java.util.List;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
diff --git
a/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
b/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
index 826b830..eba6338 100644
---
a/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
+++
b/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
public class AbstractDomainEvent_veto_Test {
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
index 48944fa..7c63914 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
@@ -30,12 +30,12 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.FatalException;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 16c317c..9707c20 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -23,9 +23,9 @@ import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.internal.collections._Collections;
import org.apache.isis.applib.services.HasTransactionId;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
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 066b440..f860e48 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
@@ -25,8 +25,8 @@ 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.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
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/actions/action/invocation/ActionDomainEventFacetDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetDefault.java
index 341b8af..bdd78fd 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetDefault.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.action.invocation;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetForActionAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetForActionAnnotation.java
index 3fc57ca..d221ecb 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetForActionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetForActionAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.action.invocation;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 9720f42..dc2cc99 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -31,6 +31,8 @@ import java.util.function.Consumer;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.internal.base._Casts;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
@@ -38,8 +40,6 @@ import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.command.spi.CommandService;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.metamodel.MetaModelService;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
index 7f05f5e..1d4d087 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
@@ -21,7 +21,7 @@ package
org.apache.isis.core.metamodel.facets.actions.action.invocation;
import java.lang.reflect.Method;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
index a8f362a..033bf3c 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
@@ -21,7 +21,7 @@ package
org.apache.isis.core.metamodel.facets.actions.action.invocation;
import java.lang.reflect.Method;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 4e94b4b..0c12a93 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -26,8 +26,8 @@ import java.lang.reflect.TypeVariable;
import java.util.List;
import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.internal.collections._Collections;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
index 6b97e80..19e2b71 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
@@ -20,8 +20,9 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
import java.util.Set;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromCollectionAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromCollectionAnnotation.java
index 6769eb0..cba4ba9 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromCollectionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromCollectionAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromDefault.java
index 2487aa0..b20f73d 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromDefault.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
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 c801e45..1768c0e 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
@@ -22,8 +22,8 @@ package
org.apache.isis.core.metamodel.facets.collections.collection.modify;
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.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
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/CollectionDomainEventFacetDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetDefault.java
index 7c6df23..dcd0a43 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetDefault.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
index dddb0d9..8f34898 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetForCollectionAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
import org.apache.isis.applib.annotation.Collection;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
index bbc2734..e0fe346 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
@@ -20,8 +20,9 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
import java.util.Collection;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromCollectionAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromCollectionAnnotation.java
index fa3725d..e9da89f 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromCollectionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromCollectionAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromDefault.java
index c222078..fe488fe 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromDefault.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
index c976659..837d257 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -19,8 +19,8 @@
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.services.eventbus.AbstractLifecycleEvent;
-import org.apache.isis.applib.services.eventbus.ObjectCreatedEvent;
+import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectCreatedEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifecycleEventFacet.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifecycleEventFacet.java
index 689c1d1..e90a1c3 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifecycleEventFacet.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifecycleEventFacet.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.services.eventbus.AbstractLifecycleEvent;
+import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
public interface LifecycleEventFacet extends Facet {
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
index 1fc8f90..1919ae4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.services.eventbus.ObjectLoadedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectLoadedEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
index 9a298de..ff8cf4a 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.services.eventbus.ObjectPersistedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectPersistedEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
index cb65962..6efe1c4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.services.eventbus.ObjectPersistingEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectPersistingEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
index 670b501..ff785ab 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.services.eventbus.ObjectRemovingEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
index 14b1cb6..20174fb 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.services.eventbus.ObjectUpdatedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
index 1922467..0f253ea 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.callbacks;
-import org.apache.isis.applib.services.eventbus.ObjectUpdatingEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 6cb262b..0005965 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -28,14 +28,14 @@ import javax.annotation.PostConstruct;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.events.lifecycle.ObjectCreatedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectLoadedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectPersistedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectPersistingEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent;
+import org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent;
import org.apache.isis.applib.services.HasTransactionId;
-import org.apache.isis.applib.services.eventbus.ObjectCreatedEvent;
-import org.apache.isis.applib.services.eventbus.ObjectLoadedEvent;
-import org.apache.isis.applib.services.eventbus.ObjectPersistedEvent;
-import org.apache.isis.applib.services.eventbus.ObjectPersistingEvent;
-import org.apache.isis.applib.services.eventbus.ObjectRemovingEvent;
-import org.apache.isis.applib.services.eventbus.ObjectUpdatedEvent;
-import org.apache.isis.applib.services.eventbus.ObjectUpdatingEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
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/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index 8b0b93b..0488214 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.services.eventbus.CssClassUiEvent;
+import org.apache.isis.applib.events.ui.CssClassUiEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index 0167e34..0dd7278 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -26,8 +26,8 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.events.ui.IconUiEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.applib.services.eventbus.IconUiEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index 40f792f..aa1ae79 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -26,8 +26,8 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.events.ui.TitleUiEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.applib.services.eventbus.TitleUiEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.config.IsisConfiguration;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 6f82d19..d357b01 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
import javax.validation.constraints.Pattern;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.services.HasTransactionId;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
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/PropertyClearFacetForDomainEventFromDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromDefault.java
index 0bb49a5..367bd83 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromDefault.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.properties.property.modify;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import
org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromPropertyAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromPropertyAnnotation.java
index 7d4aa4f..0de3716 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromPropertyAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyClearFacetForDomainEventFromPropertyAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.properties.property.modify;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import
org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
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 0f83465..9a62053 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
@@ -22,8 +22,8 @@ package
org.apache.isis.core.metamodel.facets.properties.property.modify;
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.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
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/properties/property/modify/PropertyDomainEventFacetDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetDefault.java
index 43cb32d..bbad1fd 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetDefault.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.properties.property.modify;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyAnnotation.java
index a31c90a..ba5d270 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.properties.property.modify;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromDefault.java
index 2abf22a..dc4a36b 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromDefault.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.properties.property.modify;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import
org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromPropertyAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromPropertyAnnotation.java
index 1b39525..b0db2b1 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromPropertyAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterFacetForDomainEventFromPropertyAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.properties.property.modify;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import
org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import
org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index e30c5e7..e011219 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -23,12 +23,12 @@ import java.sql.Timestamp;
import com.google.common.base.Objects;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.command.spi.CommandService;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
index 6397e6e..604118d 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
@@ -19,7 +19,7 @@ package org.apache.isis.core.metamodel.facets;
import org.junit.Test;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
index d589e77..acd3dbf 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
@@ -21,8 +21,8 @@ import java.util.Set;
import org.junit.Test;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertSame;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
index 5a8cfb8..c73b68e 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
@@ -21,8 +21,8 @@ import java.util.Set;
import org.junit.Test;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertSame;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
index 46480bc..4086b62 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
@@ -20,7 +20,7 @@ import org.joda.time.LocalDate;
import org.junit.Test;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
index 24afc78..10b12a7 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
@@ -19,7 +19,7 @@ package org.apache.isis.core.metamodel.facets;
import org.joda.time.LocalDate;
import org.junit.Test;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 4fa739d..292c95a 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -37,8 +37,8 @@ import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.annotation.InvokeOn;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.HasTransactionId;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import
org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index 16a3e65..8b60acb 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index a234754..a73be2d 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.MementoSerialization;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git
a/core/plugins/eventbus-axon/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java
b/core/plugins/eventbus-axon/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java
index 80db57a..8468850 100644
---
a/core/plugins/eventbus-axon/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java
+++
b/core/plugins/eventbus-axon/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java
@@ -19,7 +19,7 @@ package
org.apache.isis.core.runtime.services.eventbus.adapter;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import
org.apache.isis.core.runtime.services.eventbus.EventBusImplementationAbstract;
import org.axonframework.domain.EventMessage;
import org.axonframework.domain.GenericEventMessage;
diff --git
a/core/plugins/eventbus-guava/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java
b/core/plugins/eventbus-guava/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java
index 965293a..d4b0d46 100644
---
a/core/plugins/eventbus-guava/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java
+++
b/core/plugins/eventbus-guava/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java
@@ -19,7 +19,7 @@ package
org.apache.isis.core.runtime.services.eventbus.adapter;
import com.google.common.eventbus.SubscriberExceptionContext;
import com.google.common.eventbus.SubscriberExceptionHandler;
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import
org.apache.isis.core.runtime.services.eventbus.EventBusImplementationAbstract;
/**
diff --git
a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
index 87895fb..f385ec8 100644
---
a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
+++
b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
@@ -39,13 +39,13 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.listener.InstanceLifecycleListener;
+import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.isis.applib.internal.collections._Lists;
import org.apache.isis.applib.internal.collections._Maps;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.applib.services.eventbus.AbstractLifecycleEvent;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
diff --git
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
index 06cf1cc..56c525e 100644
---
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
+++
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
@@ -39,6 +39,7 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.listener.InstanceLifecycleListener;
+import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.isis.applib.internal.collections._Lists;
import org.apache.isis.applib.internal.collections._Maps;
import org.apache.isis.applib.internal.exceptions._Exceptions;
@@ -46,7 +47,6 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.applib.services.eventbus.AbstractLifecycleEvent;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
index 00879fd..0cde184 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
@@ -249,15 +249,15 @@ public class ServicesInstallerFromAnnotation extends
ServicesInstallerAbstract {
// -- domain events
public static abstract class PropertyDomainEvent<T>
- extends
org.apache.isis.applib.services.eventbus.PropertyDomainEvent<ServicesInstallerFromAnnotation,
T> {
+ extends
org.apache.isis.applib.events.domain.PropertyDomainEvent<ServicesInstallerFromAnnotation,
T> {
}
public static abstract class CollectionDomainEvent<T>
- extends
org.apache.isis.applib.services.eventbus.CollectionDomainEvent<ServicesInstallerFromAnnotation,
T> {
+ extends
org.apache.isis.applib.events.domain.CollectionDomainEvent<ServicesInstallerFromAnnotation,
T> {
}
public static abstract class ActionDomainEvent
- extends
org.apache.isis.applib.services.eventbus.ActionDomainEvent<ServicesInstallerFromAnnotation>
{
+ extends
org.apache.isis.applib.events.domain.ActionDomainEvent<ServicesInstallerFromAnnotation>
{
}
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
index 25fe3c3..5bca628 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
@@ -18,8 +18,7 @@ package org.apache.isis.core.runtime.services.eventbus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.services.eventbus.EventBusImplementation;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
diff --git
a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
index 497f243..572e0d0 100644
---
a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
+++
b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
@@ -39,7 +39,7 @@ public class Object_clearHints {
this.object = object;
}
- public static class ActionDomainEvent extends
org.apache.isis.applib.services.eventbus.ActionDomainEvent<Object> { }
+ public static class ActionDomainEvent extends
org.apache.isis.applib.events.domain.ActionDomainEvent<Object> { }
@Action(
domainEvent = ActionDomainEvent.class,
diff --git
a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 4274c0d..d4361e1 100644
---
a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++
b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -40,9 +40,9 @@ public class SimpleModule extends ModuleAbstract {
}
public static class PropertyDomainEvent<S,T>
- extends
org.apache.isis.applib.services.eventbus.PropertyDomainEvent<S,T> {}
+ extends
org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {}
public static class CollectionDomainEvent<S,T>
- extends
org.apache.isis.applib.services.eventbus.CollectionDomainEvent<S,T> {}
+ extends
org.apache.isis.applib.events.domain.CollectionDomainEvent<S,T> {}
public static class ActionDomainEvent<S> extends
- org.apache.isis.applib.services.eventbus.ActionDomainEvent<S> {}
+ org.apache.isis.applib.events.domain.ActionDomainEvent<S> {}
}
diff --git
a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
index 83eeed1..d62b3e6 100644
---
a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
+++
b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport_v3_2;
import org.apache.isis.applib.services.repository.RepositoryService;
--
To stop receiving notification emails like this one, please contact
ahu...@apache.org.
