This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3091
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3091 by this push:
new 2bffaf7f7f ISIS-3091: fixes compile issues (2)
2bffaf7f7f is described below
commit 2bffaf7f7f22810dbea7e21ca4cca9bd4b47d9c1
Author: Dan Haywood <[email protected]>
AuthorDate: Fri Jul 22 14:48:51 2022 +0100
ISIS-3091: fixes compile issues (2)
---
.../bookmarks/BookmarkServiceDefault.java | 1 +
.../command/CommandDtoFactoryDefault.java | 1 +
.../command/CommandExecutorServiceDefault.java | 1 +
.../command/SchemaValueMarshallerDefault.java | 1 +
.../core/runtimeservices/email/EmailServiceDefault.java | 1 +
.../runtimeservices/eventbus/EventBusServiceSpring.java | 2 ++
.../executor/MemberExecutorServiceDefault.java | 1 +
.../runtimeservices/factory/FactoryServiceDefault.java | 1 +
.../homepage/HomePageResolverServiceDefault.java | 1 +
.../runtimeservices/i18n/po/TranslationServicePo.java | 1 +
.../runtimeservices/icons/ObjectIconServiceDefault.java | 1 +
.../interaction/InteractionDtoFactoryDefault.java | 1 +
.../core/runtimeservices/jaxb/JaxbServiceDefault.java | 1 +
.../locale/LocaleChoiceProviderDefault.java | 1 +
.../memento/ObjectMementoServiceDefault.java | 1 +
.../menubars/MenuBarsLoaderServiceDefault.java | 1 +
.../menubars/bootstrap/MenuBarsServiceBS.java | 1 +
.../runtimeservices/message/MessageServiceDefault.java | 1 +
.../publish/CommandPublisherDefault.java | 1 +
.../publish/EntityChangesPublisherDefault.java | 1 +
.../publish/EntityPropertyChangePublisherDefault.java | 1 +
.../publish/ExecutionPublisherDefault.java | 1 +
.../publish/ObjectLifecyclePublisherDefault.java | 1 +
.../recognizer/ExceptionRecognizerServiceDefault.java | 1 +
.../runtimeservices/routing/RoutingServiceDefault.java | 1 +
.../runtimeservices/scratchpad/ScratchpadDefault.java | 1 +
.../session/InteractionServiceDefault.java | 1 +
.../runtimeservices/sitemap/SitemapServiceDefault.java | 1 +
.../transaction/TransactionServiceSpring.java | 1 +
.../urlencoding/UrlEncodingServiceWithCompression.java | 1 +
.../user/ImpersonateMenuAdvisorDefault.java | 1 +
.../user/ImpersonatedUserHolderDefault.java | 1 +
.../userreg/EmailNotificationServiceDefault.java | 1 +
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 1 +
enhance.sh | 17 +++++++----------
.../applib/IsisModuleExtAuditTrailApplib.java | 8 +++-----
.../EntityPropertyChangeSubscriberForAuditTrail.java | 5 ++++-
.../role/dom/ApplicationRoleRepositoryAbstract.java | 3 ++-
.../secman/applib/seed/SeedSecurityModuleService.java | 3 ++-
.../secman/integration/authorizor/AuthorizorSecman.java | 5 +++--
.../PermissionsEvaluationServiceForSecman.java | 3 ++-
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 5 +++--
.../spiimpl/TableColumnVisibilityServiceForSecman.java | 3 ++-
.../userreg/UserRegistrationServiceForSecman.java | 3 ++-
.../isis/extensions/secman/jdo/util/RegexReplacer.java | 3 ++-
.../isis/extensions/secman/jpa/util/RegexReplacer.java | 3 ++-
46 files changed, 69 insertions(+), 27 deletions(-)
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
index 250f0c9c2e..9193809be3 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
@@ -47,6 +47,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
index e0224d620f..623bd5eeca 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
@@ -44,6 +44,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.schema.cmd.v2.ActionDto;
import org.apache.isis.schema.cmd.v2.CommandDto;
import org.apache.isis.schema.cmd.v2.ParamDto;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
index 028ee31ed6..6dfbd97a8d 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -61,6 +61,7 @@ import
org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.schema.cmd.v2.ActionDto;
import org.apache.isis.schema.cmd.v2.CommandDto;
import org.apache.isis.schema.cmd.v2.MemberDto;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/SchemaValueMarshallerDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/SchemaValueMarshallerDefault.java
index cad3e60a12..35a3d05003 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/SchemaValueMarshallerDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/SchemaValueMarshallerDefault.java
@@ -36,6 +36,7 @@ import
org.apache.isis.core.metamodel.services.schema.SchemaValueMarshallerAbstr
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.PackedManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.schema.common.v2.CollectionDto;
import org.apache.isis.schema.common.v2.TypedTupleDto;
import org.apache.isis.schema.common.v2.ValueType;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
index 9221fb1f68..a77d5e2be8 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
@@ -39,6 +39,7 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.email.EmailService;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.extern.log4j.Log4j2;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
index a81a3c3d0c..879c0114f5 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
@@ -20,6 +20,8 @@ package org.apache.isis.core.runtimeservices.eventbus;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
index 32fbc7c6c4..4978fd27d2 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
@@ -67,6 +67,7 @@ import
org.apache.isis.core.metamodel.spec.ManagedObjects.UnwrapUtil;
import org.apache.isis.core.metamodel.spec.PackedManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.schema.ixn.v2.ActionInvocationDto;
import lombok.Getter;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
index 4e858367e2..15c34d2f3f 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
@@ -42,6 +42,7 @@ import
org.apache.isis.core.metamodel.services.objectlifecycle.ObjectLifecyclePu
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.NonNull;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
index a4f28db163..da5fced4a6 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -33,6 +33,7 @@ import
org.apache.isis.applib.services.homepage.HomePageResolverService;
import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.core.metamodel.commons.ClassExtensions;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
index a55c2682f0..237ffea102 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
@@ -40,6 +40,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.Getter;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/icons/ObjectIconServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/icons/ObjectIconServiceDefault.java
index df0ece0640..7df9b82d0c 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/icons/ObjectIconServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/icons/ObjectIconServiceDefault.java
@@ -41,6 +41,7 @@ import org.apache.isis.commons.internal.resources._Resources;
import org.apache.isis.core.metamodel.facets.object.icon.ObjectIcon;
import org.apache.isis.core.metamodel.facets.object.icon.ObjectIconService;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
index a3593eb768..6db7b46ebb 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
@@ -46,6 +46,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.schema.cmd.v2.ActionDto;
import org.apache.isis.schema.cmd.v2.ParamDto;
import org.apache.isis.schema.cmd.v2.PropertyDto;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/jaxb/JaxbServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/jaxb/JaxbServiceDefault.java
index 620fbf27b1..882dad1b60 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/jaxb/JaxbServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/jaxb/JaxbServiceDefault.java
@@ -42,6 +42,7 @@ import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.resources._Xml;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/locale/LocaleChoiceProviderDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/locale/LocaleChoiceProviderDefault.java
index 5e031fb343..7d61bce3f9 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/locale/LocaleChoiceProviderDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/locale/LocaleChoiceProviderDefault.java
@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.locale.LocaleChoiceProvider;
import org.apache.isis.commons.collections.Can;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.AccessLevel;
import lombok.Getter;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/ObjectMementoServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/ObjectMementoServiceDefault.java
index 4884faf209..f10531c696 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/ObjectMementoServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/ObjectMementoServiceDefault.java
@@ -47,6 +47,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.PackedManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.Getter;
import lombok.NonNull;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index 204c724669..42aa35e627 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -40,6 +40,7 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.viewer.web.WebAppContextPath;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
index d96551449b..54576ac467 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
@@ -74,6 +74,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
index 100dba8aa7..d3cdfee42f 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
@@ -36,6 +36,7 @@ import
org.apache.isis.applib.services.i18n.TranslationContext;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.interaction.session.MessageBroker;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
@Service
@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".MessageServiceDefault")
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/CommandPublisherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/CommandPublisherDefault.java
index 2233008c30..e45bf49d5e 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/CommandPublisherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/CommandPublisherDefault.java
@@ -36,6 +36,7 @@ import
org.apache.isis.applib.services.publishing.spi.CommandSubscriber;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.having.HasEnabling;
import org.apache.isis.core.metamodel.services.publishing.CommandPublisher;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/EntityChangesPublisherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/EntityChangesPublisherDefault.java
index 9c9c36f8d5..69b0b251e1 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/EntityChangesPublisherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/EntityChangesPublisherDefault.java
@@ -30,6 +30,7 @@ import
org.apache.isis.applib.services.publishing.spi.EntityChangesSubscriber;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.having.HasEnabling;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.core.transaction.changetracking.EntityChangesPublisher;
import
org.apache.isis.core.transaction.changetracking.HasEnlistedEntityChanges;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java
index ebac2f848d..30e3ad081e 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java
@@ -33,6 +33,7 @@ import
org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.having.HasEnabling;
import
org.apache.isis.core.metamodel.services.objectlifecycle.HasEnlistedEntityPropertyChanges;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import
org.apache.isis.core.transaction.changetracking.EntityPropertyChangePublisher;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionPublisherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionPublisherDefault.java
index 17f30f9826..62fe2a68f4 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionPublisherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionPublisherDefault.java
@@ -39,6 +39,7 @@ import
org.apache.isis.applib.services.publishing.spi.ExecutionSubscriber;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.having.HasEnabling;
import org.apache.isis.core.metamodel.services.publishing.ExecutionPublisher;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
index c237c5d523..f3a7c64822 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
@@ -46,6 +46,7 @@ import
org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingLifecycleE
import
org.apache.isis.core.metamodel.services.objectlifecycle.ObjectLifecyclePublisher;
import
org.apache.isis.core.metamodel.services.objectlifecycle.PropertyChangeRecord;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import
org.apache.isis.core.transaction.changetracking.EntityPropertyChangePublisher;
import
org.apache.isis.core.transaction.changetracking.PersistenceCallbackHandlerAbstract;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/recognizer/ExceptionRecognizerServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/recognizer/ExceptionRecognizerServiceDefault.java
index 14cdf9ab75..6d02214ca2 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/recognizer/ExceptionRecognizerServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/recognizer/ExceptionRecognizerServiceDefault.java
@@ -35,6 +35,7 @@ import
org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.NonNull;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
index 7eb6b00626..74ba435fbc 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.homepage.HomePageResolverService;
import org.apache.isis.applib.services.routing.RoutingService;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
@Service
@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".RoutingServiceDefault")
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/scratchpad/ScratchpadDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/scratchpad/ScratchpadDefault.java
index b32ad08ce2..c8b8d98b44 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/scratchpad/ScratchpadDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/scratchpad/ScratchpadDefault.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.annotation.InteractionScope;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.scratchpad.Scratchpad;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
@Service
@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".Scratchpad")
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionServiceDefault.java
index c9ae6047e7..c82d967ff9 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionServiceDefault.java
@@ -67,6 +67,7 @@ import
org.apache.isis.core.interaction.session.IsisInteraction;
import org.apache.isis.core.metamodel.services.publishing.CommandPublisher;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.events.MetamodelEventService;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.core.security.authentication.InteractionContextFactory;
import lombok.NonNull;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
index 3b24fcf9e3..813fcaadcd 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
@@ -46,6 +46,7 @@ import org.apache.isis.core.metamodel.spec.ActionScope;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.util.Facets;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
index f4e241d513..32011f1eff 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
@@ -49,6 +49,7 @@ import org.apache.isis.commons.functional.Try;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.interaction.scope.TransactionBoundaryAware;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.core.transaction.events.TransactionAfterCompletionEvent;
import lombok.val;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java
index c310b15d98..3b8538aba5 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
@Service
@Named(IsisModuleCoreRuntimeServices.NAMESPACE +
".UrlEncodingServiceWithCompression")
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonateMenuAdvisorDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonateMenuAdvisorDefault.java
index 54004b3d7d..a8e2296dcd 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonateMenuAdvisorDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonateMenuAdvisorDefault.java
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.user.ImpersonateMenuAdvisor;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
/**
* This default implementation simply returns empty lists.
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonatedUserHolderDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonatedUserHolderDefault.java
index 5753d1a305..9847fd4581 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonatedUserHolderDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonatedUserHolderDefault.java
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.user.ImpersonatedUserHolder;
import org.apache.isis.applib.services.user.UserMemento;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
/**
* Used by the framework's default implementation of {@link
org.apache.isis.applib.services.user.UserService} to
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
index 8a2f7ab577..2a695af14c 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
@@ -42,6 +42,7 @@ import
org.apache.isis.applib.services.userreg.events.EmailEventAbstract;
import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
@Service
@Named(IsisModuleCoreRuntimeServices.NAMESPACE +
".EmailNotificationServiceDefault")
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
index a9fecdad8e..511f4b2b5f 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -38,6 +38,7 @@ import
org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.util.snapshot.XmlSnapshot;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
@Service
@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".XmlSnapshotServiceDefault")
diff --git a/enhance.sh b/enhance.sh
index ae04b24cdc..5d2106b4e5 100644
--- a/enhance.sh
+++ b/enhance.sh
@@ -20,9 +20,8 @@
#
usage() {
- #echo "$(basename $0): [-a] [-c] [-e] [-o] [-m] [-s] [-d] [-t]"
>&2
- echo "$(basename $0): [-c] [-e] [-o] [-m] [-s] [-d] [-t]"
>&2
- #echo " -a : audit trail (extensions/security)"
>&2
+ echo "$(basename $0): [-a] [-c] [-e] [-o] [-m] [-s] [-d] [-t]"
>&2
+ echo " -a : audit trail (extensions/security)"
>&2
echo " -c : command log (extensions/core)"
>&2
echo " -e : execution log (extensions/core)"
>&2
echo " -o : execution outbox (extensions/core)"
>&2
@@ -45,17 +44,16 @@ SESSIONLOG=""
PATHS=()
-#while getopts ":acdeomsht" arg; do
-while getopts ":cdeomsht" arg; do
+while getopts ":acdeomsht" arg; do
case $arg in
h)
usage
exit 0
;;
-# a)
-# AUDITTRAIL="enhance"
-# PATHS+=( "extensions/security/audittrail/persistence-jdo" )
-# ;;
+ a)
+ AUDITTRAIL="enhance"
+ PATHS+=( "extensions/security/audittrail/persistence-jdo" )
+ ;;
c)
COMMANDLOG="enhance"
PATHS+=( "extensions/core/commandlog/persistence-jdo" )
@@ -92,7 +90,6 @@ done
shift $((OPTIND-1))
-
echo "AUDITTRAIL : $AUDITTRAIL"
echo "COMMANDLOG : $COMMANDLOG"
echo "EXECUTIONLOG : $EXECUTIONLOG"
diff --git
a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/audittrail/applib/IsisModuleExtAuditTrailApplib.java
b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/audittrail/applib/IsisModuleExtAuditTrailApplib.java
index f4d199c4c1..c037cdbcf5 100644
---
a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/audittrail/applib/IsisModuleExtAuditTrailApplib.java
+++
b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/audittrail/applib/IsisModuleExtAuditTrailApplib.java
@@ -23,15 +23,13 @@ package org.apache.isis.audittrail.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.sessionlog.applib.app.SessionLogMenu;
-import
org.apache.isis.sessionlog.applib.spiimpl.SessionSubscriberForSessionLog;
-import org.apache.isis.sessionlog.applib.spiimpl.SessionLogServiceInitializer;
-
+import org.apache.isis.audittrail.applib.app.AuditTrailMenu;
+import
org.apache.isis.audittrail.applib.spiimpl.EntityPropertyChangeSubscriberForAuditTrail;
@Configuration
@Import({
AuditTrailMenu.class,
- SessionSubscriberForSessionLog.class
+ EntityPropertyChangeSubscriberForAuditTrail.class
})
public class IsisModuleExtAuditTrailApplib {
diff --git
a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/audittrail/applib/spiimpl/EntityPropertyChangeSubscriberForAuditTrail.java
b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/audittrail/applib/spiimpl/EntityPropertyChangeSubscriberForAuditTrail.java
index 567fd0fbc9..48790e44db 100644
---
a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/audittrail/applib/spiimpl/EntityPropertyChangeSubscriberForAuditTrail.java
+++
b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/audittrail/applib/spiimpl/EntityPropertyChangeSubscriberForAuditTrail.java
@@ -31,6 +31,7 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.publishing.spi.EntityPropertyChange;
import
org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber;
import org.apache.isis.applib.services.session.SessionSubscriber;
+import org.apache.isis.audittrail.applib.IsisModuleExtAuditTrailApplib;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
@@ -42,12 +43,14 @@ import lombok.extern.log4j.Log4j2;
*/
@Service
@RequiredArgsConstructor(onConstructor_ = {@Inject})
-@Named("isis.ext.audittrail.EntityPropertyChangeSubscriberForAuditTrail")
+@Named(EntityPropertyChangeSubscriberForAuditTrail.LOGICAL_TYPE_NAME)
@Priority(PriorityPrecedence.LATE)
@Qualifier("audittrail")
@Log4j2
public class EntityPropertyChangeSubscriberForAuditTrail implements
EntityPropertyChangeSubscriber {
+ static final String LOGICAL_TYPE_NAME =
IsisModuleExtAuditTrailApplib.NAMESPACE +
".EntityPropertyChangeSubscriberForAuditTrail";
+
@Override
public void onChanging(EntityPropertyChange entityPropertyChange) {
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
index f0e2a72b93..b23ab86855 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
@@ -36,6 +36,7 @@ import
org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import
org.apache.isis.extensions.secman.applib.permission.dom.mixins.ApplicationPermission_delete;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.isis.extensions.secman.applib.util.RegexReplacer;
@@ -43,7 +44,7 @@ import
org.apache.isis.extensions.secman.applib.util.RegexReplacer;
import lombok.val;
@Repository
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".ApplicationRoleRepository")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE + ".ApplicationRoleRepository")
public abstract class ApplicationRoleRepositoryAbstract<R extends
ApplicationRole>
implements ApplicationRoleRepository {
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/seed/SeedSecurityModuleService.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/seed/SeedSecurityModuleService.java
index f8373e2d55..9fba561231 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/seed/SeedSecurityModuleService.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/seed/SeedSecurityModuleService.java
@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.events.metamodel.MetamodelEvent;
import org.apache.isis.applib.services.iactnlayer.InteractionService;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import
org.apache.isis.extensions.secman.applib.seed.scripts.SeedUsersAndRolesFixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -49,7 +50,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Service
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".SeedSecurityModuleService")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE + ".SeedSecurityModuleService")
@Qualifier("Default")
@RequiredArgsConstructor(onConstructor_ = {@Inject })
@Log4j2
diff --git
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/authorizor/AuthorizorSecman.java
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/authorizor/AuthorizorSecman.java
index 1a5fddcdf3..8b4bfa41b4 100644
---
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/authorizor/AuthorizorSecman.java
+++
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/authorizor/AuthorizorSecman.java
@@ -38,6 +38,7 @@ import
org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.security.authorization.Authorizor;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionValueSet;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
@@ -50,7 +51,7 @@ import lombok.val;
* @since 2.0 {@index}
*/
@Service
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".AuthorizorSecman")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE + ".AuthorizorSecman")
@javax.annotation.Priority(PriorityPrecedence.EARLY - 10)
@Qualifier("Secman")
public class AuthorizorSecman implements Authorizor {
@@ -90,7 +91,7 @@ public class AuthorizorSecman implements Authorizor {
}
@Component
- @Named(IsisModuleCoreRuntimeServices.NAMESPACE +
".AuthorizorSecman.PermissionCache")
+ @Named(IsisModuleExtSecmanApplib.NAMESPACE +
".AuthorizorSecman.PermissionCache")
@InteractionScope
static class PermissionCache implements DisposableBean {
diff --git
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
index a3676ab231..82d1daac0c 100644
---
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
+++
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
@@ -37,6 +37,7 @@ import
org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.IsisConfiguration.Extensions.Secman;
import
org.apache.isis.core.config.IsisConfiguration.Extensions.Secman.PermissionsEvaluationPolicy;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionValue;
@@ -50,7 +51,7 @@ import lombok.val;
* @since 2.0 {@index}
*/
@Service
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE +
".PermissionsEvaluationServiceForSecman")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE +
".PermissionsEvaluationServiceForSecman")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("Secman")
public class PermissionsEvaluationServiceForSecman
diff --git
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
index 7a671b96fe..cc09700900 100644
---
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
+++
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
@@ -37,6 +37,7 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.user.ImpersonateMenuAdvisor;
import org.apache.isis.applib.services.user.UserService;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import org.apache.isis.extensions.secman.applib.role.dom.ApplicationRole;
import
org.apache.isis.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
@@ -47,7 +48,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Service
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE +
".ImpersonateMenuAdvisorForSecman")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE +
".ImpersonateMenuAdvisorForSecman")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("SecMan")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -107,7 +108,7 @@ public class ImpersonateMenuAdvisorForSecman implements
ImpersonateMenuAdvisor {
// -- CACHE
@Component
- @Named(IsisModuleCoreRuntimeServices.NAMESPACE +
".ImpersonateMenuAdvisorForSecman.Cache")
+ @Named(IsisModuleExtSecmanApplib.NAMESPACE +
".ImpersonateMenuAdvisorForSecman.Cache")
@InteractionScope
static class Cache implements DisposableBean {
diff --git
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
index 94fac3563d..ed2738a007 100644
---
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
+++
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.tablecol.TableColumnVisibilityService;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.applib.user.menu.MeService;
@@ -37,7 +38,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Service
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE +
".TableColumnVisibilityServiceForSecman")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE +
".TableColumnVisibilityServiceForSecman")
@javax.annotation.Priority(PriorityPrecedence.LATE - 10)
@Qualifier("Secman")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
index 6c1f4a8745..dc7a26de89 100644
---
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
+++
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
@@ -32,6 +32,7 @@ import
org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.applib.value.Password;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import
org.apache.isis.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
import
org.apache.isis.extensions.secman.applib.user.dom.ApplicationUserRepository;
@@ -48,7 +49,7 @@ import lombok.val;
* @since 2.0 {@index}
*/
@Service
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE +
".UserRegistrationServiceForSecman")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE +
".UserRegistrationServiceForSecman")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("SecMan")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/util/RegexReplacer.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/util/RegexReplacer.java
index 4fb75a6046..20ee319050 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/util/RegexReplacer.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/util/RegexReplacer.java
@@ -23,11 +23,12 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import lombok.val;
@Component
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".RegexReplacer")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE + ".RegexReplacer")
public class RegexReplacer implements
org.apache.isis.extensions.secman.applib.util.RegexReplacer {
@Override
diff --git
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/util/RegexReplacer.java
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/util/RegexReplacer.java
index c2af75fe92..182f0809a8 100644
---
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/util/RegexReplacer.java
+++
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/util/RegexReplacer.java
@@ -23,11 +23,12 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import lombok.val;
@Component
-@Named(IsisModuleCoreRuntimeServices.NAMESPACE + ".RegexReplacer")
+@Named(IsisModuleExtSecmanApplib.NAMESPACE + ".RegexReplacer")
public class RegexReplacer implements
org.apache.isis.extensions.secman.applib.util.RegexReplacer {
@Override
