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 5759244 ISIS-2464: applib: align package names with semantic changes
5759244 is described below
commit 57592440c2aac348dd329b2204eb04f701252b14
Author: Andi Huber <[email protected]>
AuthorDate: Thu Nov 19 22:17:22 2020 +0100
ISIS-2464: applib: align package names with semantic changes
---
.../modules/applib-ant/examples/annotation/Action.java | 2 +-
.../applib-ant/examples/annotation/DomainObject.java | 6 +++---
.../modules/applib-ant/examples/annotation/Property.java | 2 +-
.../services/audit}/ChangingEntitiesLogging.java | 4 +++-
.../examples/services/audit/EntityAuditLogging.java | 1 +
.../applib-svc/examples/services/audit/package-info.java | 2 +-
.../{publish => audit/spi}/ChangingEntities.java | 2 +-
.../{publish => audit/spi}/ChangingEntitiesListener.java | 2 +-
.../services/audit/spi}/EntityAuditListener.java | 3 ++-
.../applib-svc/examples/services/command/Command.java | 2 +-
.../examples/services/command/spi/CommandListener.java | 3 ---
.../examples/services/iactn/spi}/ExecutionListener.java | 2 +-
.../examples/services/iactn/spi}/ExecutionLogging.java | 2 +-
.../examples/services/iactn/spi}/package-info.java | 4 ++--
.../examples/services/session/SessionLoggingService.java | 2 +-
.../java/org/apache/isis/applib/IsisModuleApplib.java | 4 ++--
.../java/org/apache/isis/applib/annotation/Action.java | 2 +-
.../org/apache/isis/applib/annotation/DomainObject.java | 6 +++---
.../java/org/apache/isis/applib/annotation/Property.java | 2 +-
.../applib/services/audit}/ChangingEntitiesLogging.java | 4 +++-
.../isis/applib/services/audit/EntityAuditLogging.java | 1 +
.../apache/isis/applib/services/audit/package-info.java | 2 +-
.../{publish => audit/spi}/ChangingEntities.java | 2 +-
.../{publish => audit/spi}/ChangingEntitiesListener.java | 2 +-
.../applib/services/audit/spi}/EntityAuditListener.java | 3 ++-
.../org/apache/isis/applib/services/command/Command.java | 2 +-
.../applib/services/command/spi/CommandListener.java | 3 ---
.../applib/services/iactn/spi}/ExecutionListener.java | 2 +-
.../applib/services/iactn/spi}/ExecutionLogging.java | 2 +-
.../isis/applib/services/iactn/spi}/package-info.java | 4 ++--
.../applib/services/session/SessionLoggingService.java | 2 +-
.../apache/isis/applib/types/MemberIdentifierType.java | 2 +-
.../org/apache/isis/applib/types/TargetActionType.java | 2 +-
.../org/apache/isis/applib/types/TargetClassType.java | 2 +-
.../org/apache/isis/core/config/IsisConfiguration.java | 16 ++++++++--------
.../publish/ExecutionDispatchPropertyFacet.java | 2 +-
.../isis/core/runtime/iactn/InteractionSession.java | 2 +-
.../changetracking/ChangingEntitiesFactory.java | 2 +-
.../changetracking/EntityAuditDispatcher.java | 4 ++--
.../changetracking/EntityChangeTrackerDefault.java | 2 +-
.../changetracking/HasEnlistedChangingEntities.java | 2 +-
.../changetracking/SimpleChangingEntities.java | 2 +-
.../publish/ChangingEntitiesDispatcherDefault.java | 4 ++--
.../publish/ExecutionDispatcherDefault.java | 2 +-
...ChangingEntitiesListenerToCaptureChangesInMemory.java | 4 ++--
.../ExecutionListenerToCaptureInteractionsInMemory.java | 2 +-
.../applayer/auditing/EntityAuditListenerForTesting.java | 2 +-
.../applayer/publishing/PublisherServiceForTesting.java | 6 +++---
48 files changed, 71 insertions(+), 69 deletions(-)
diff --git
a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
index 28d1b29..09f8b61 100644
---
a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
+++
b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
@@ -32,7 +32,7 @@ import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceFo
import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto;
import
org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ExecutionListener;
+import org.apache.isis.applib.services.iactn.spi.ExecutionListener;
/**
* Domain semantics for domain object collection.
diff --git
a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
index 1cffb94..f8a8814 100644
---
a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
+++
b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
@@ -64,9 +64,9 @@ public @interface DomainObject {
// end::refguide-domain-events[]
/**
* Whether entity changes should be dispatched to
- * {@link org.apache.isis.applib.services.audit.EntityAuditListener}s
- * and whether entity changes, captured as {@link
org.apache.isis.applib.services.publish.ChangingEntities},
- * should be dispatched to {@link
org.apache.isis.applib.services.publish.ChangingEntitiesListener}s.
+ * {@link org.apache.isis.applib.services.audit.spi.EntityAuditListener}s
+ * and whether entity changes, captured as {@link
org.apache.isis.applib.services.audit.spi.ChangingEntities},
+ * should be dispatched to {@link
org.apache.isis.applib.services.audit.spi.ChangingEntitiesListener}s.
* @apiNote does only apply to entity objects
*/
// tag::refguide[]
diff --git
a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Property.java
b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Property.java
index 707e593..2c50dfb 100644
---
a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Property.java
+++
b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Property.java
@@ -32,7 +32,7 @@ import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceFo
import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto;
import
org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ExecutionListener;
+import org.apache.isis.applib.services.iactn.spi.ExecutionListener;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntitiesLogging.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/ChangingEntitiesLogging.java
similarity index 90%
rename from
api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntitiesLogging.java
rename to
api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/ChangingEntitiesLogging.java
index 7993b82..7b967d4 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntitiesLogging.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/ChangingEntitiesLogging.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.audit;
import javax.inject.Named;
@@ -26,6 +26,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
+import org.apache.isis.applib.services.audit.spi.ChangingEntitiesListener;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.schema.chg.v2.ChangesDto;
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/EntityAuditLogging.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/EntityAuditLogging.java
index 43dd28d..7eb6c33 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/EntityAuditLogging.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/EntityAuditLogging.java
@@ -30,6 +30,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.audit.spi.EntityAuditListener;
import org.apache.isis.applib.services.bookmark.Bookmark;
import lombok.extern.log4j.Log4j2;
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/package-info.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/package-info.java
index 182074b..b4ab557 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/package-info.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * The {@link org.apache.isis.applib.services.audit.EntityAuditListener}
auditing service provides a simple mechanism to
+ * The {@link org.apache.isis.applib.services.audit.spi.EntityAuditListener}
auditing service provides a simple mechanism to
* capture changes to data. It is called for each property that has changed on
any domain object, as a set of pre- and post-values.
*
*
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntities.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/ChangingEntities.java
similarity index 96%
rename from
api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntities.java
rename to
api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/ChangingEntities.java
index 72b3cf0..4b83342 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntities.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/ChangingEntities.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.audit.spi;
import java.sql.Timestamp;
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntitiesListener.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/ChangingEntitiesListener.java
similarity index 81%
rename from
api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntitiesListener.java
rename to
api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/ChangingEntitiesListener.java
index a09d754..4603a2b 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntitiesListener.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/ChangingEntitiesListener.java
@@ -1,4 +1,4 @@
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.audit.spi;
public interface ChangingEntitiesListener {
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/audit/EntityAuditListener.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/EntityAuditListener.java
similarity index 94%
rename from
api/applib/src/main/java/org/apache/isis/applib/services/audit/EntityAuditListener.java
rename to
api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/EntityAuditListener.java
index ff4808f..bae640c 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/audit/EntityAuditListener.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/spi/EntityAuditListener.java
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.audit;
+package org.apache.isis.applib.services.audit.spi;
import java.sql.Timestamp;
import java.util.UUID;
+import org.apache.isis.applib.services.audit.EntityAuditLogging;
import org.apache.isis.applib.services.bookmark.Bookmark;
/**
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/Command.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/Command.java
index 897b2cf..f0e261b 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/Command.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/Command.java
@@ -252,7 +252,7 @@ public class Command implements HasUniqueId, HasUsername,
HasCommandDto {
* <p>
* This can be used as a hint to decide whether to persist the command
* to a datastore, for example for auditing (though
- * {@link org.apache.isis.applib.services.publish.ExecutionListener} is
+ * {@link org.apache.isis.applib.services.iactn.spi.ExecutionListener}
is
* an alternative for that use case) or so that it can be retrieved
* and replayed on another system, eg for regression testing.
* </p>
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandListener.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandListener.java
index 7acf2c7..d700ce4 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandListener.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandListener.java
@@ -27,8 +27,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.command.Command;
-import lombok.extern.log4j.Log4j2;
-
/**
* SPI
*/
@@ -54,7 +52,6 @@ public interface CommandListener {
@Named("isisApplib.CommandServiceListenerNull")
@Order(OrderPrecedence.LATE)
@Qualifier("Null")
- @Log4j2
public static class Null implements CommandListener {
@Override
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ExecutionListener.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/ExecutionListener.java
similarity index 97%
rename from
api/applib/src/main/java/org/apache/isis/applib/services/publish/ExecutionListener.java
rename to
api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/ExecutionListener.java
index 8027b5e..2d10b6b 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ExecutionListener.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/ExecutionListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.iactn.spi;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ExecutionLogging.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/ExecutionLogging.java
similarity index 97%
rename from
api/applib/src/main/java/org/apache/isis/applib/services/publish/ExecutionLogging.java
rename to
api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/ExecutionLogging.java
index 06133cb..24635cf 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ExecutionLogging.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/ExecutionLogging.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.iactn.spi;
import javax.inject.Named;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/package-info.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/package-info.java
similarity index 87%
rename from
api/applib/src/main/java/org/apache/isis/applib/services/publish/package-info.java
rename to
api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/package-info.java
index 5f3cb74..e05b8b7 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/package-info.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/spi/package-info.java
@@ -18,11 +18,11 @@
*/
/**
- * The {@link org.apache.isis.applib.services.publish.ExecutionListener} API
is intended for coarse-grained
+ * The {@link org.apache.isis.applib.services.iactn.spi.ExecutionListener} API
is intended for coarse-grained
* publish/subscribe for system-to-system interactions, from Apache Isis to
some other system. Events that can be
* published are action invocations/property edits, and changed objects. A
typical use case is to publish onto a
* pub/sub bus such as ActiveMQ with Camel to keep other systems up to date.
*
*
*/
-package org.apache.isis.applib.services.publish;
\ No newline at end of file
+package org.apache.isis.applib.services.iactn.spi;
\ No newline at end of file
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/session/SessionLoggingService.java
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/session/SessionLoggingService.java
index f3014fb..296ed1e 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/session/SessionLoggingService.java
+++
b/api/applib/src/main/adoc/modules/applib-svc/examples/services/session/SessionLoggingService.java
@@ -23,7 +23,7 @@ import java.util.Date;
import org.apache.isis.applib.annotation.Programmatic;
/**
- * Similar to the {@link
org.apache.isis.applib.services.audit.EntityAuditListener}, this defines an API
to track
+ * Similar to the {@link
org.apache.isis.applib.services.audit.spi.EntityAuditListener}, this defines an
API to track
* the status of the current sessions ("users logged on") on the
system.
*/
// tag::refguide[]
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
b/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
index 4f7a32f..b13439c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
@@ -29,6 +29,7 @@ import
org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel;
import org.apache.isis.applib.mixins.metamodel.Object_downloadMetamodelXml;
import org.apache.isis.applib.mixins.metamodel.Object_objectIdentifier;
import org.apache.isis.applib.mixins.metamodel.Object_objectType;
+import org.apache.isis.applib.services.audit.ChangingEntitiesLogging;
import org.apache.isis.applib.services.audit.EntityAuditLogging;
import org.apache.isis.applib.services.bookmark.BookmarkHolder_lookup;
import org.apache.isis.applib.services.bookmark.BookmarkHolder_object;
@@ -38,10 +39,9 @@ import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceFo
import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto;
import
org.apache.isis.applib.services.commanddto.processor.spi.CommandDtoProcessorServiceIdentity;
import org.apache.isis.applib.services.confview.ConfigurationMenu;
+import org.apache.isis.applib.services.iactn.spi.ExecutionLogging;
import org.apache.isis.applib.services.layout.LayoutServiceMenu;
import org.apache.isis.applib.services.metamodel.MetaModelServiceMenu;
-import org.apache.isis.applib.services.publish.ChangingEntitiesLogging;
-import org.apache.isis.applib.services.publish.ExecutionLogging;
import org.apache.isis.applib.services.session.SessionLoggingServiceLogging;
import org.apache.isis.schema.IsisModuleSchema;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
index 28d1b29..09f8b61 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
@@ -32,7 +32,7 @@ import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceFo
import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto;
import
org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ExecutionListener;
+import org.apache.isis.applib.services.iactn.spi.ExecutionListener;
/**
* Domain semantics for domain object collection.
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
index 1cffb94..f8a8814 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
@@ -64,9 +64,9 @@ public @interface DomainObject {
// end::refguide-domain-events[]
/**
* Whether entity changes should be dispatched to
- * {@link org.apache.isis.applib.services.audit.EntityAuditListener}s
- * and whether entity changes, captured as {@link
org.apache.isis.applib.services.publish.ChangingEntities},
- * should be dispatched to {@link
org.apache.isis.applib.services.publish.ChangingEntitiesListener}s.
+ * {@link org.apache.isis.applib.services.audit.spi.EntityAuditListener}s
+ * and whether entity changes, captured as {@link
org.apache.isis.applib.services.audit.spi.ChangingEntities},
+ * should be dispatched to {@link
org.apache.isis.applib.services.audit.spi.ChangingEntitiesListener}s.
* @apiNote does only apply to entity objects
*/
// tag::refguide[]
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index 707e593..2c50dfb 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -32,7 +32,7 @@ import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceFo
import
org.apache.isis.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto;
import
org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ExecutionListener;
+import org.apache.isis.applib.services.iactn.spi.ExecutionListener;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntitiesLogging.java
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/ChangingEntitiesLogging.java
similarity index 90%
rename from
api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntitiesLogging.java
rename to
api/applib/src/main/java/org/apache/isis/applib/services/audit/ChangingEntitiesLogging.java
index 7993b82..7b967d4 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ChangingEntitiesLogging.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/ChangingEntitiesLogging.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.audit;
import javax.inject.Named;
@@ -26,6 +26,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
+import org.apache.isis.applib.services.audit.spi.ChangingEntitiesListener;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.schema.chg.v2.ChangesDto;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/audit/EntityAuditLogging.java
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/EntityAuditLogging.java
index 43dd28d..7eb6c33 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/audit/EntityAuditLogging.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/EntityAuditLogging.java
@@ -30,6 +30,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.audit.spi.EntityAuditListener;
import org.apache.isis.applib.services.bookmark.Bookmark;
import lombok.extern.log4j.Log4j2;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/audit/package-info.java
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/package-info.java
index 182074b..b4ab557 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/audit/package-info.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * The {@link org.apache.isis.applib.services.audit.EntityAuditListener}
auditing service provides a simple mechanism to
+ * The {@link org.apache.isis.applib.services.audit.spi.EntityAuditListener}
auditing service provides a simple mechanism to
* capture changes to data. It is called for each property that has changed on
any domain object, as a set of pre- and post-values.
*
*
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntities.java
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/ChangingEntities.java
similarity index 96%
rename from
api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntities.java
rename to
api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/ChangingEntities.java
index 72b3cf0..4b83342 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntities.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/ChangingEntities.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.audit.spi;
import java.sql.Timestamp;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntitiesListener.java
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/ChangingEntitiesListener.java
similarity index 81%
rename from
api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntitiesListener.java
rename to
api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/ChangingEntitiesListener.java
index a09d754..4603a2b 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publish/ChangingEntitiesListener.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/ChangingEntitiesListener.java
@@ -1,4 +1,4 @@
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.audit.spi;
public interface ChangingEntitiesListener {
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/EntityAuditListener.java
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/EntityAuditListener.java
similarity index 94%
rename from
api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/EntityAuditListener.java
rename to
api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/EntityAuditListener.java
index ff4808f..bae640c 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/EntityAuditListener.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/audit/spi/EntityAuditListener.java
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.audit;
+package org.apache.isis.applib.services.audit.spi;
import java.sql.Timestamp;
import java.util.UUID;
+import org.apache.isis.applib.services.audit.EntityAuditLogging;
import org.apache.isis.applib.services.bookmark.Bookmark;
/**
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
b/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index 897b2cf..f0e261b 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -252,7 +252,7 @@ public class Command implements HasUniqueId, HasUsername,
HasCommandDto {
* <p>
* This can be used as a hint to decide whether to persist the command
* to a datastore, for example for auditing (though
- * {@link org.apache.isis.applib.services.publish.ExecutionListener} is
+ * {@link org.apache.isis.applib.services.iactn.spi.ExecutionListener}
is
* an alternative for that use case) or so that it can be retrieved
* and replayed on another system, eg for regression testing.
* </p>
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandListener.java
b/api/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandListener.java
index 7acf2c7..d700ce4 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandListener.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandListener.java
@@ -27,8 +27,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.command.Command;
-import lombok.extern.log4j.Log4j2;
-
/**
* SPI
*/
@@ -54,7 +52,6 @@ public interface CommandListener {
@Named("isisApplib.CommandServiceListenerNull")
@Order(OrderPrecedence.LATE)
@Qualifier("Null")
- @Log4j2
public static class Null implements CommandListener {
@Override
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ExecutionListener.java
b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/ExecutionListener.java
similarity index 97%
rename from
api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ExecutionListener.java
rename to
api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/ExecutionListener.java
index 8027b5e..2d10b6b 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ExecutionListener.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/ExecutionListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.iactn.spi;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ExecutionLogging.java
b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/ExecutionLogging.java
similarity index 97%
rename from
api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ExecutionLogging.java
rename to
api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/ExecutionLogging.java
index 06133cb..24635cf 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/ExecutionLogging.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/ExecutionLogging.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.publish;
+package org.apache.isis.applib.services.iactn.spi;
import javax.inject.Named;
diff --git
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/package-info.java
b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/package-info.java
similarity index 87%
rename from
api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/package-info.java
rename to
api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/package-info.java
index 5f3cb74..e05b8b7 100644
---
a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/package-info.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/spi/package-info.java
@@ -18,11 +18,11 @@
*/
/**
- * The {@link org.apache.isis.applib.services.publish.ExecutionListener} API
is intended for coarse-grained
+ * The {@link org.apache.isis.applib.services.iactn.spi.ExecutionListener} API
is intended for coarse-grained
* publish/subscribe for system-to-system interactions, from Apache Isis to
some other system. Events that can be
* published are action invocations/property edits, and changed objects. A
typical use case is to publish onto a
* pub/sub bus such as ActiveMQ with Camel to keep other systems up to date.
*
*
*/
-package org.apache.isis.applib.services.publish;
\ No newline at end of file
+package org.apache.isis.applib.services.iactn.spi;
\ No newline at end of file
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
b/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
index f3014fb..296ed1e 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
@@ -23,7 +23,7 @@ import java.util.Date;
import org.apache.isis.applib.annotation.Programmatic;
/**
- * Similar to the {@link
org.apache.isis.applib.services.audit.EntityAuditListener}, this defines an API
to track
+ * Similar to the {@link
org.apache.isis.applib.services.audit.spi.EntityAuditListener}, this defines an
API to track
* the status of the current sessions ("users logged on") on the
system.
*/
// tag::refguide[]
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
b/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
index 0b3d374..974dfb4 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.services.command.Command;
import lombok.experimental.UtilityClass;
/**
- * As per {@link Command#getMemberIdentifier()} and {@link
org.apache.isis.applib.services.audit.EntityAuditListener#audit(UUID, int,
String, Bookmark, String, String, String, String, String, Timestamp)}.
+ * As per {@link Command#getMemberIdentifier()} and {@link
org.apache.isis.applib.services.audit.spi.EntityAuditListener#audit(UUID, int,
String, Bookmark, String, String, String, String, String, Timestamp)}.
*/
public class MemberIdentifierType {
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
b/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
index 187ec27..cf44d26 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.services.command.Command;
import lombok.experimental.UtilityClass;
/**
- * A user-friendly name of an action, as per {@link
Command#getTargetAction()}, {@link
org.apache.isis.applib.services.audit.EntityAuditListener#audit(UUID, int,
String, Bookmark, String, String, String, String, String, Timestamp)}.
+ * A user-friendly name of an action, as per {@link
Command#getTargetAction()}, {@link
org.apache.isis.applib.services.audit.spi.EntityAuditListener#audit(UUID, int,
String, Bookmark, String, String, String, String, String, Timestamp)}.
*/
@UtilityClass
public class TargetActionType {
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
b/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
index 8c57de0..a85a71d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.services.command.Command;
import lombok.experimental.UtilityClass;
/**
- * A user-friendly name of a class, as per {@link Command#getTargetClass()},
{@link org.apache.isis.applib.services.audit.EntityAuditListener#audit(UUID,
int, String, Bookmark, String, String, String, String, String, Timestamp)}.
+ * A user-friendly name of a class, as per {@link Command#getTargetClass()},
{@link
org.apache.isis.applib.services.audit.spi.EntityAuditListener#audit(UUID, int,
String, Bookmark, String, String, String, String, String, Timestamp)}.
*/
@UtilityClass
public class TargetClassType {
diff --git
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index d02ed32..ae254cd 100644
---
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -58,10 +58,10 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.applib.services.audit.EntityAuditListener;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
+import org.apache.isis.applib.services.audit.spi.EntityAuditListener;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ChangingEntities;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.commons.internal.context._Context;
@@ -185,10 +185,10 @@ public class IsisConfiguration {
/**
* The default for whether the identities of changed objects
should be sent through to the
- * {@link
org.apache.isis.applib.services.publish.ExecutionListener} for publishing.
+ * {@link
org.apache.isis.applib.services.iactn.spi.ExecutionListener} for publishing.
*
* <p>
- * The service's {@link
org.apache.isis.applib.services.publish.ExecutionListener#publish(ChangingEntities)
publish}
+ * The service's {@link
org.apache.isis.applib.services.iactn.spi.ExecutionListener#publish(ChangingEntities)
publish}
* method is called only once per transaction, with {@link
ChangingEntities} collecting details of
* all changed domain objects.
* </p>
@@ -714,10 +714,10 @@ public class IsisConfiguration {
/**
* The default for whether action invocations should be sent
through to the
- * {@link
org.apache.isis.applib.services.publish.ExecutionListener} for publishing.
+ * {@link
org.apache.isis.applib.services.iactn.spi.ExecutionListener} for publishing.
*
* <p>
- * The service's {@link
org.apache.isis.applib.services.publish.ExecutionListener#publish(Interaction.Execution)
publish}
+ * The service's {@link
org.apache.isis.applib.services.iactn.spi.ExecutionListener#publish(Interaction.Execution)
publish}
* method is called only once per transaction, with
* {@link Interaction.Execution} collecting details of
* the identity of the target object, the action invoked,
the action arguments and the returned
@@ -848,10 +848,10 @@ public class IsisConfiguration {
/**
* The default for whether property edits should be sent
through to the
- * {@link
org.apache.isis.applib.services.publish.ExecutionListener} for publishing.
+ * {@link
org.apache.isis.applib.services.iactn.spi.ExecutionListener} for publishing.
*
* <p>
- * The service's {@link
org.apache.isis.applib.services.publish.ExecutionListener#publish(Interaction.Execution)
publish}
+ * The service's {@link
org.apache.isis.applib.services.iactn.spi.ExecutionListener#publish(Interaction.Execution)
publish}
* method is called only once per transaction, with
* {@link Interaction.Execution} collecting details of
* the identity of the target object, the property edited,
and the new value of the property.
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacet.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacet.java
index aacc34c..42a59c7 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacet.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacet.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.properties.publish;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ExecutionListener;
+import org.apache.isis.applib.services.iactn.spi.ExecutionListener;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.publishing.ExecutionDispatcher;
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionSession.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionSession.java
index af675c1..e1bd91b 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionSession.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionSession.java
@@ -48,7 +48,7 @@ import lombok.Setter;
* captures the details of an action invocation or property edit (along
* with any nested calls to other actions through wrapper factory) for
* the purpose of publishing using
- * {@link org.apache.isis.applib.services.publish.ExecutionListener}.
+ * {@link org.apache.isis.applib.services.iactn.spi.ExecutionListener}.
* </p>
*
* @see IsisInteractionFactory
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/ChangingEntitiesFactory.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/ChangingEntitiesFactory.java
index a6d08c0..8f3b8f6 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/ChangingEntitiesFactory.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/ChangingEntitiesFactory.java
@@ -27,9 +27,9 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.EntityChangeKind;
import org.apache.isis.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ChangingEntities;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityAuditDispatcher.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityAuditDispatcher.java
index 2b425dc..af9c597 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityAuditDispatcher.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityAuditDispatcher.java
@@ -31,7 +31,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.audit.EntityAuditListener;
+import org.apache.isis.applib.services.audit.spi.EntityAuditListener;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.user.UserService;
@@ -44,7 +44,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
/**
- * Wrapper around {@link
org.apache.isis.applib.services.audit.EntityAuditListener}.
+ * Wrapper around {@link
org.apache.isis.applib.services.audit.spi.EntityAuditListener}.
*/
@Service
@Named("isisRuntime.EntityAuditDispatcher")
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
index 2dc9f4d..93d3b12 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
@@ -37,12 +37,12 @@ import
org.apache.isis.applib.annotation.IsisInteractionScope;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.isis.applib.services.TransactionScopeListener;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.metrics.MetricsService;
-import org.apache.isis.applib.services.publish.ChangingEntities;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.collections._Maps;
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/HasEnlistedChangingEntities.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/HasEnlistedChangingEntities.java
index 730b812..231ce67 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/HasEnlistedChangingEntities.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/HasEnlistedChangingEntities.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.core.runtime.persistence.changetracking;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.services.publish.ChangingEntities;
import org.apache.isis.applib.services.user.UserService;
public interface HasEnlistedChangingEntities {
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/SimpleChangingEntities.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/SimpleChangingEntities.java
index 0daff6b..ba27404 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/SimpleChangingEntities.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/SimpleChangingEntities.java
@@ -24,7 +24,7 @@ import java.util.UUID;
import java.util.function.Supplier;
import org.apache.isis.applib.services.RepresentsInteractionMemberExecution;
-import org.apache.isis.applib.services.publish.ChangingEntities;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
import org.apache.isis.schema.chg.v2.ChangesDto;
import lombok.NonNull;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ChangingEntitiesDispatcherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ChangingEntitiesDispatcherDefault.java
index 6c13e5f..d162c4d 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ChangingEntitiesDispatcherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ChangingEntitiesDispatcherDefault.java
@@ -30,8 +30,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.audit.spi.ChangingEntitiesListener;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.services.publish.ChangingEntitiesListener;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.collections.Can;
import
org.apache.isis.core.runtime.persistence.changetracking.ChangingEntitiesDispatcher;
@@ -41,7 +41,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
/**
- * Wrapper around {@link
org.apache.isis.applib.services.audit.ChangingEntitiesListener}.
+ * Wrapper around {@link
org.apache.isis.applib.services.audit.spi.ChangingEntitiesListener}.
*/
@Service
@Named("isisRuntime.ChangingEntitiesDispatcher")
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionDispatcherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionDispatcherDefault.java
index f341462..ab57ba1 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionDispatcherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionDispatcherDefault.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.IsisInteractionScope;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ExecutionListener;
+import org.apache.isis.applib.services.iactn.spi.ExecutionListener;
import org.apache.isis.core.metamodel.services.publishing.ExecutionDispatcher;
import lombok.RequiredArgsConstructor;
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/_changes/ChangingEntitiesListenerToCaptureChangesInMemory.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/_changes/ChangingEntitiesListenerToCaptureChangesInMemory.java
index 7aecdc0..fba562a 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/_changes/ChangingEntitiesListenerToCaptureChangesInMemory.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/_changes/ChangingEntitiesListenerToCaptureChangesInMemory.java
@@ -24,8 +24,8 @@ import java.util.stream.Stream;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.services.publish.ChangingEntities;
-import org.apache.isis.applib.services.publish.ChangingEntitiesListener;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
+import org.apache.isis.applib.services.audit.spi.ChangingEntitiesListener;
import org.apache.isis.schema.chg.v2.ChangesDto;
import lombok.val;
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/_interactions/ExecutionListenerToCaptureInteractionsInMemory.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/_interactions/ExecutionListenerToCaptureInteractionsInMemory.java
index b2e794c..f592205 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/_interactions/ExecutionListenerToCaptureInteractionsInMemory.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/_interactions/ExecutionListenerToCaptureInteractionsInMemory.java
@@ -25,7 +25,7 @@ import java.util.stream.Stream;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.publish.ExecutionListener;
+import org.apache.isis.applib.services.iactn.spi.ExecutionListener;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import org.apache.isis.schema.ixn.v2.InteractionDto;
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/auditing/EntityAuditListenerForTesting.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/auditing/EntityAuditListenerForTesting.java
index 207a18a..8196468 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/auditing/EntityAuditListenerForTesting.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/auditing/EntityAuditListenerForTesting.java
@@ -28,7 +28,7 @@ import javax.inject.Inject;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.services.audit.EntityAuditListener;
+import org.apache.isis.applib.services.audit.spi.EntityAuditListener;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/publishing/PublisherServiceForTesting.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/publishing/PublisherServiceForTesting.java
index 39879f8..250abab 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/publishing/PublisherServiceForTesting.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/publishing/PublisherServiceForTesting.java
@@ -26,10 +26,10 @@ import javax.inject.Inject;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.services.audit.spi.ChangingEntities;
+import org.apache.isis.applib.services.audit.spi.ChangingEntitiesListener;
import org.apache.isis.applib.services.iactn.Interaction.Execution;
-import org.apache.isis.applib.services.publish.ChangingEntities;
-import org.apache.isis.applib.services.publish.ChangingEntitiesListener;
-import org.apache.isis.applib.services.publish.ExecutionListener;
+import org.apache.isis.applib.services.iactn.spi.ExecutionListener;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.applib.util.schema.MemberExecutionDtoUtils;
import org.apache.isis.commons.collections.Can;
