You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/31 08:16:44 UTC
[isis] branch master updated: ISIS-2511: rationalize core namespaces
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 250d52d ISIS-2511: rationalize core namespaces
250d52d is described below
commit 250d52d0ee2da12297455818247f0752d34d3c3d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 31 09:16:26 2021 +0100
ISIS-2511: rationalize core namespaces
---
.../isis/applib/mixins/timestamp/Timestampable.java | 5 ++++-
.../services/userreg/EmailNotificationService.java | 5 ++---
.../isis/applib/services/wrapper/WrapperFactory.java | 11 ++++++-----
.../applib/services/xmlsnapshot/XmlSnapshotService.java | 2 +-
.../beans/IsisBeanFactoryPostProcessorForSpring.java | 2 +-
.../isis/core/config/converters/PatternsConverter.java | 2 +-
.../core/config/environment/IsisSystemEnvironment.java | 2 +-
.../core/config/viewer/wicket/WebAppContextPath.java | 2 +-
.../InteractionAwareTransactionalBoundaryHandler.java | 2 +-
.../isis/core/runtime/events/MetamodelEventService.java | 2 +-
.../bookmarks/BookmarkServiceDefault.java | 2 +-
.../core/runtimeservices/clock/ClockServiceDefault.java | 2 +-
.../command/CommandDtoServiceInternalDefault.java | 2 +-
.../command/CommandExecutorServiceDefault.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../core/runtimeservices/email/EmailServiceDefault.java | 2 +-
.../runtimeservices/eventbus/EventBusServiceSpring.java | 2 +-
.../executor/MemberExecutorServiceDefault.java | 2 +-
.../runtimeservices/factory/FactoryServiceDefault.java | 2 +-
.../runtimeservices/i18n/po/TranslationServicePo.java | 2 +-
.../InteractionDtoServiceInternalDefault.java | 2 +-
.../core/runtimeservices/jaxb/JaxbServiceDefault.java | 2 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../runtimeservices/message/MessageServiceDefault.java | 2 +-
.../publish/CommandPublisherDefault.java | 2 +-
.../publish/EntityChangesPublisherDefault.java | 2 +-
.../publish/EntityPropertyChangePublisherDefault.java | 2 +-
.../publish/ExecutionPublisherDefault.java | 2 +-
.../queryresultscache/QueryResultsCacheDefault.java | 2 +-
.../recognizer/ExceptionRecognizerServiceDefault.java | 2 +-
.../repository/RepositoryServiceDefault.java | 6 +++---
.../runtimeservices/routing/RoutingServiceDefault.java | 6 +++---
.../runtimeservices/scratchpad/ScratchpadDefault.java | 12 +-----------
.../session/InteractionFactoryDefault.java | 17 +++++++----------
.../core/runtimeservices/sudo/SudoServiceDefault.java | 2 +-
.../transaction/TransactionServiceSpring.java | 2 +-
.../urlencoding/UrlEncodingServiceWithCompression.java | 2 +-
.../core/runtimeservices/user/UserServiceDefault.java | 2 +-
.../userprof/UserProfileServiceDefault.java | 2 +-
.../userreg/EmailNotificationServiceDefault.java | 5 +----
.../runtimeservices/wrapper/WrapperFactoryDefault.java | 7 +------
.../core/runtimeservices/xml/XmlServiceDefault.java | 2 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 12 +-----------
.../changetracking/EntityChangeTrackerDefault.java | 2 +-
.../changetracking/events/TimestampService.java | 2 +-
.../health/HealthIndicatorUsingHealthCheckService.java | 4 +---
.../modules/logonlog/WebModuleLogOnExceptionLogger.java | 2 +-
.../templresources/WebModuleTemplateResources.java | 2 +-
.../extensions/cors/impl/IsisModuleExtCorsImpl.java | 2 +-
.../isis/legacy/applib/DomainObjectContainer.java | 2 +-
.../persistence/jdo/datanucleus/config/DnSettings.java | 6 +++---
.../jdosupport/JdoSupportServiceDefault.java | 8 +-------
.../jdo/datanucleus/schema/JdoSchemaService.java | 2 +-
.../integration/metamodel/JpaEntityFacetFactory.java | 5 +++++
.../bypass/authentication/AuthenticatorBypass.java | 2 +-
.../security/bypass/authorization/AuthorizorBypass.java | 2 +-
.../keycloak/authentication/AuthenticatorKeycloak.java | 2 +-
.../keycloak/authorization/AuthorizorKeycloak.java | 2 +-
.../security/keycloak/webmodule/WebModuleKeycloak.java | 2 +-
.../shiro/authentication/AuthenticatorShiro.java | 2 +-
.../security/shiro/authorization/AuthorizorShiro.java | 2 +-
.../isis/security/shiro/webmodule/WebModuleShiro.java | 2 +-
63 files changed, 88 insertions(+), 119 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java
index 8900847..ed509bb 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java
@@ -18,5 +18,8 @@
*/
package org.apache.isis.applib.mixins.timestamp;
-public interface Timestampable extends HoldsUpdatedBy, HoldsUpdatedAt {
+public interface Timestampable
+extends
+ HoldsUpdatedBy,
+ HoldsUpdatedAt {
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
index 8337029..f5ce156 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
@@ -25,10 +25,9 @@ import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
/**
* Supporting service for the user-registration functionality.
- *
* <p>
- * The framework provides a default implementation which in turn uses the
- * {@link org.apache.isis.applib.services.email.EmailService}, namely <code>EmailServiceDefault</code>.
+ * The framework provides a default implementation which in turn uses the
+ * {@link org.apache.isis.applib.services.email.EmailService}, namely <code>EmailServiceDefault</code>.
* </p>
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
index 88f9b1f..8e48d76 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java
@@ -29,15 +29,16 @@ import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
/**
- * Provides the ability to "wrap" of a domain object such that it can
+ *
+ * Provides the ability to 'wrap' a domain object such that it can
* be interacted with while enforcing the hide/disable/validate rules implied by
* the Apache Isis programming model.
*
* <p>
- * The wrapper can alternatively also be used to execute the action
- * asynchronously, through an {@link java.util.concurrent.ExecutorService}.
- * Any business rules will be invoked synchronously beforehand, however.
- * hand
+ * The wrapper can alternatively also be used to execute the action
+ * asynchronously, through an {@link java.util.concurrent.ExecutorService}.
+ * Any business rules will be invoked synchronously beforehand, however.
+ * hand
* </p>
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotService.java b/api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotService.java
index 4c40f25..405ab97 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotService.java
@@ -24,11 +24,11 @@ import org.w3c.dom.Element;
/**
* This service allows an XML document to be generated capturing the data of a root entity and specified related
* entities. This XML can be used for various purposes, such as mail merge/reporting, or adhoc auditing.
- *
* <p>
* The framework provides an implementation of this service (<tt>XmlSnapshotServiceDefault</tt>) which is automatically
* registered and available for use; no further configuration is required.
* </p>
+ *
* @since 1.x {@index}
*/
public interface XmlSnapshotService {
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index a492ecc..3337e89 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -46,7 +46,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Component
-@Named("isisConfig.IsisBeanFactoryPostProcessorForSpring")
+@Named("isis.config.IsisBeanFactoryPostProcessorForSpring")
@Log4j2
public class IsisBeanFactoryPostProcessorForSpring
implements BeanFactoryPostProcessor {
diff --git a/core/config/src/main/java/org/apache/isis/core/config/converters/PatternsConverter.java b/core/config/src/main/java/org/apache/isis/core/config/converters/PatternsConverter.java
index de62ba2..836377a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/converters/PatternsConverter.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/converters/PatternsConverter.java
@@ -33,7 +33,7 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Maps;
@Component
-@Named("isisConfig.PatternsConverter")
+@Named("isis.config.PatternsConverter")
@ConfigurationPropertiesBinding
public class PatternsConverter implements Converter<String, Map<Pattern, String>> {
diff --git a/core/config/src/main/java/org/apache/isis/core/config/environment/IsisSystemEnvironment.java b/core/config/src/main/java/org/apache/isis/core/config/environment/IsisSystemEnvironment.java
index 62dde28..e5f360e 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/environment/IsisSystemEnvironment.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/environment/IsisSystemEnvironment.java
@@ -50,7 +50,7 @@ import lombok.extern.log4j.Log4j2;
* @implNote acts as the framework's bootstrapping entry-point for Spring
*/
@Service
-@Named("isisCommons.IsisSystemEnvironment")
+@Named("isis.config.IsisSystemEnvironment")
@Order(-1_073_741_824) // same as OrderedPrecedence#HIGH
@Primary
@Qualifier("Default")
diff --git a/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
index aba00bb..17f9cfc 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
@@ -43,7 +43,7 @@ import lombok.val;
*/
@Service
@Singleton
-@Named("isisConfig.WebAppContextPath")
+@Named("isis.config.WebAppContextPath")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
index d2782a4..ed6e1de 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
@@ -46,7 +46,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisInteraction.InteractionAwareTransactionalBoundaryHandler")
+@Named("isis.interaction.InteractionAwareTransactionalBoundaryHandler")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/MetamodelEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/MetamodelEventService.java
index ed883b4..ae917a5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/MetamodelEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/MetamodelEventService.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.events.MetamodelEvent;
* post-construct phase has finished and before the pre-destroy phase has begun.
*/
@Service
-@Named("isisRuntime.MetamodelEventService")
+@Named("isis.runtime.MetamodelEventService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 215c23e..d09ec39 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
@@ -53,7 +53,7 @@ import lombok.val;
* This service enables a serializable 'bookmark' to be created for an entity.
*/
@Service
-@Named("isisRuntimeServices.BookmarkServiceDefault")
+@Named("isis.runtimeservices.BookmarkServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
index 4792659..e085405 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
@@ -17,7 +17,7 @@ import org.apache.isis.core.interaction.session.InteractionTracker;
import lombok.RequiredArgsConstructor;
@Service
-@Named("isisRuntimeServices.ClockServiceDefault")
+@Named("isis.runtimeservices.ClockServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
index 1bff400..82d9bfb 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
@@ -54,7 +54,7 @@ import org.apache.isis.schema.common.v2.OidsDto;
import lombok.val;
@Service
-@Named("isisRuntimeServices.CommandDtoServiceInternalDefault")
+@Named("isis.runtimeservices.CommandDtoServiceInternalDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 2e58fe5..28f323c 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
@@ -84,7 +84,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRuntimeServices.CommandExecutorServiceDefault")
+@Named("isis.runtimeservices.CommandExecutorServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
index f3a33c0..2f68812 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
@@ -51,7 +51,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0
*/
@Service
-@Named("isisRuntimeServices.ConfigurationViewServiceDefault")
+@Named("isis.runtimeservices.ConfigurationViewServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 dfea43f..e09d6f0 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
@@ -47,7 +47,7 @@ import lombok.extern.log4j.Log4j2;
* A service that sends email notifications when specific events occur
*/
@Service
-@Named("isisRuntimeServices.EmailServiceDefault")
+@Named("isis.runtimeservices.EmailServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 4aaa2df..125e6b5 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
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
@Service
-@Named("isisRuntimeServices.EventBusServiceSpring")
+@Named("isis.runtimeservices.EventBusServiceSpring")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Spring")
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 51ff5ae..d667dcc 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
@@ -72,7 +72,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRuntimeServices.MemberExecutorServiceDefault")
+@Named("isis.runtimeservices.MemberExecutorServiceDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
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 c59c55b..4ce7dc6 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
@@ -50,7 +50,7 @@ import lombok.NonNull;
import lombok.val;
@Service
-@Named("isisRuntimeServices.FactoryServiceDefault")
+@Named("isis.runtimeservices.FactoryServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 cc8d074..48afd91 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
@@ -43,7 +43,7 @@ import org.apache.isis.core.config.IsisConfiguration;
import lombok.val;
@Service
-@Named("isisRuntimeServices.TranslationServicePo")
+@Named("isis.runtimeservices.TranslationServicePo")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Po")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoServiceInternalDefault.java
index 92ed2cd..f6ac707 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoServiceInternalDefault.java
@@ -55,7 +55,7 @@ import org.apache.isis.schema.ixn.v2.ActionInvocationDto;
import org.apache.isis.schema.ixn.v2.PropertyEditDto;
@Service
-@Named("isisRuntimeServices.InteractionDtoServiceInternalDefault")
+@Named("isis.runtimeservices.InteractionDtoServiceInternalDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 31e0f6f..2c34506 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
@@ -49,7 +49,7 @@ import lombok.SneakyThrows;
import lombok.val;
@Service
-@Named("isisRuntimeServices.JaxbServiceDefault")
+@Named("isis.runtimeservices.JaxbServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 c04eb10..fd440d4 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
@@ -43,7 +43,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRuntimeServices.MenuBarsLoaderServiceDefault")
+@Named("isis.runtimeservices.MenuBarsLoaderServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
index 5ee4f70..e1cc551 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -69,7 +69,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRuntimeServices.MenuBarsServiceBS3")
+@Named("isis.runtimeservices.MenuBarsServiceBS3")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("BS3")
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 a873807..17cbf02 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
@@ -37,7 +37,7 @@ import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.interaction.session.MessageBroker;
@Service
-@Named("isisRuntimeServices.MessageServiceDefault")
+@Named("isis.runtimeservices.MessageServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 af4c26e..5db82b1 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
@@ -40,7 +40,7 @@ import lombok.NonNull;
import lombok.RequiredArgsConstructor;
@Service
-@Named("isisRuntimeServices.CommandPublisherDefault")
+@Named("isis.runtimeservices.CommandPublisherDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Internal")
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 e09c851..dd988ed 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
@@ -42,7 +42,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Service
-@Named("isisRuntimeServices.EntityChangesPublisherDefault")
+@Named("isis.runtimeservices.EntityChangesPublisherDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
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 f5178fc..8071a9d 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
@@ -44,7 +44,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Service
-@Named("isisRuntimeServices.EntityPropertyChangePublisherDefault")
+@Named("isis.runtimeservices.EntityPropertyChangePublisherDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
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 75ce1d3..66c9082 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
@@ -44,7 +44,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Service
-@Named("isisRuntimeServices.ExecutionPublisherDefault")
+@Named("isis.runtimeservices.ExecutionPublisherDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/queryresultscache/QueryResultsCacheDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/queryresultscache/QueryResultsCacheDefault.java
index 75d6b95..5da2b5b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/queryresultscache/QueryResultsCacheDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/queryresultscache/QueryResultsCacheDefault.java
@@ -55,7 +55,7 @@ import lombok.extern.log4j.Log4j2;
* understand.
*/
@Service
-@Named("isisRuntime.QueryResultsCacheDefault")
+@Named("isis.runtimeservices.QueryResultsCacheDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@InteractionScope
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 e873a84..12a04b3 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
@@ -46,7 +46,7 @@ import lombok.val;
*
*/
@Service
-@Named("isisRuntimeServices.ExceptionRecognizerServiceDefault")
+@Named("isis.runtimeservices.ExceptionRecognizerServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
index 06dc21a..d2c9620 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
@@ -33,7 +33,7 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.exceptions.unrecoverable.PersistFailedException;
@@ -57,8 +57,8 @@ import org.apache.isis.core.metamodel.spec.ManagedObjects.UnwrapUtil;
import lombok.NonNull;
import lombok.val;
-@Repository
-@Named("isisRuntimeServices.RepositoryServiceDefault")
+@Service
+@Named("isis.runtimeservices.RepositoryServiceDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
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 2b4f439..69de571 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
@@ -24,14 +24,14 @@ import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.homepage.HomePageResolverService;
import org.apache.isis.applib.services.routing.RoutingService;
-@Controller
-@Named("isisRuntimeServices.RoutingServiceDefault")
+@Service
+@Named("isis.runtimeservices.RoutingServiceDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
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 3a6821c..980cdf9 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
@@ -32,18 +32,8 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.scratchpad.Scratchpad;
import org.apache.isis.commons.internal.collections._Maps;
-/**
- * This service (API and implementation) provides a mechanism to interchange information between multiple objects invoked in the same
- * interaction. Most commonly this will be as the result of invoking a {@link org.apache.isis.applib.annotation.Bulk}
- * action.
- *
- * <p>
- * This implementation has only one implementation (this class) in applib, so it is annotated with
- * {@link org.apache.isis.applib.annotation.DomainService}. This means that it is automatically registered and
- * available for use; no further configuration is required.
- */
@Service
-@Named("isisRuntimeServices.Scratchpad")
+@Named("isis.runtimeservices.Scratchpad")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
index d789978..5006841 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
@@ -76,23 +76,20 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
/**
- * Is the factory of {@link InteractionSession}s, also holding a reference to the current session using
- * a thread-local.
- *
- * <p>
- * The class is considered as analogous to (and is in many ways a wrapper for) a JDO
- * <code>PersistenceManagerFactory</code>.
- * </p>
- *
+ * Is the factory of {@link InteractionSession}s.
+ *
+ * @implNote holds a reference to the current session using a thread-local
*/
@Service
-@Named("isisRuntime.InteractionFactoryDefault")
+@Named("isis.runtimeservices.InteractionFactoryDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
@Log4j2
public class InteractionFactoryDefault
-implements InteractionFactory, InteractionTracker {
+implements
+ InteractionFactory,
+ InteractionTracker {
@Inject AuthenticationManager authenticationManager;
@Inject MetamodelEventService runtimeEventService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
index b27a7ff..724fe2f 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
@@ -45,7 +45,7 @@ import lombok.val;
import jakarta.annotation.PostConstruct;
@Service
-@Named("isisRuntimeServices.SudoServiceDefault")
+@Named("isis.runtimeservices.SudoServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 87587c4..0ecf1c7 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
@@ -61,7 +61,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Service
-@Named("isisRuntimeServices.TransactionServiceSpring")
+@Named("isis.runtimeservices.TransactionServiceSpring")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Spring")
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 24d55ba..79feaa5 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
@@ -33,7 +33,7 @@ import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.base._Strings;
@Service
-@Named("isisRuntimeServices.UrlEncodingServiceWithCompression")
+@Named("isis.runtimeservices.UrlEncodingServiceWithCompression")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Compression")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
index 37956ac..5bce6c3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.core.interaction.session.InteractionTracker;
@Service
-@Named("isisRuntimeServices.UserServiceDefault")
+@Named("isis.runtimeservices.UserServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
index 2b26716..fc84044 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.userprof.UserProfileService;
@Service
-@Named("isisRuntimeServices.UserProfileServiceDefault")
+@Named("isis.runtimeservices.UserProfileServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 c00afda..97b1856 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
@@ -44,11 +44,8 @@ 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;
-/**
- * A service that sends email notifications when specific events occur
- */
@Service
-@Named("isisRuntimeServices.EmailNotificationServiceDefault")
+@Named("isis.runtimeservices.EmailNotificationServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index 711e7e5..4fa2199 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -109,13 +109,8 @@ import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
-/**
- * This service provides the ability to 'wrap' a domain object such that it can
- * be interacted with, while enforcing the hide/disable/validate rules as implied by
- * the Isis programming model.
- */
@Service
-@Named("isisRuntimeServices.WrapperFactoryDefault")
+@Named("isis.runtimeservices.WrapperFactoryDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xml/XmlServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xml/XmlServiceDefault.java
index 74c5ba1..61ada39 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xml/XmlServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xml/XmlServiceDefault.java
@@ -52,7 +52,7 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
* @since 2.0 {@index}
*/
@Service
-@Named("isisRuntimeServices.XmlService")
+@Named("isis.runtimeservice.XmlService")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
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 cea0354..aafa8ef 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
@@ -40,18 +40,8 @@ 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;
-/**
- * This service allows an XML document to be generated capturing the data of a root entity and specified related
- * entities. This XML can be used for various purposes, such as mail merge/reporting, or adhoc auditing.
- *
- * <p>
- * This implementation has no UI and there are no other implementations of the service API, and so it annotated
- * with {@link org.apache.isis.applib.annotation.DomainService}. Because this class is implemented in core, this means
- * that it is automatically registered and available for use; no further configuration is required.
- * @since 2.0 {@index}
- */
@Service
-@Named("isisRuntimeServices.XmlSnapshotServiceDefault")
+@Named("isis.runtimeservices.XmlSnapshotServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
index fdf4fbd..274ea55 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
@@ -81,7 +81,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Service
-@Named("isisRuntime.EntityChangeTrackerDefault")
+@Named("isis.transaction.EntityChangeTrackerDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
index 722d9ef..19cae74 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.user.UserService;
import lombok.val;
@Service
-@Named("isisTransaction.TimestampService")
+@Named("isis.transaction.TimestampService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
index 84ec182..853b6e2 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
@@ -19,13 +19,11 @@
package org.apache.isis.core.webapp.health;
import java.util.Optional;
-import java.util.concurrent.Callable;
import javax.inject.Inject;
import javax.inject.Named;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-
import org.springframework.boot.actuate.health.Health;
import org.springframework.stereotype.Component;
@@ -36,7 +34,7 @@ import org.apache.isis.core.security.authentication.health.HealthAuthentication;
import lombok.val;
@Component
-@Named("isisWebapp.HealthCheckService") // this appears in the endpoint.
+@Named("isis.webapp.HealthCheckService") // logical name appears in the endpoint
public class HealthIndicatorUsingHealthCheckService extends AbstractHealthIndicator {
private final InteractionFactory isisInteractionFactory;
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
index 61075a2..c373ae2 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
@@ -41,7 +41,7 @@ import lombok.Getter;
* @since 2.0
*/
@Service
-@Named("isisWebapp.WebModuleLogOnExceptionLogger")
+@Named("isis.webapp.WebModuleLogOnExceptionLogger")
@Order(OrderPrecedence.EARLY - 100)
@Qualifier("LogOnExceptionLogger")
public final class WebModuleLogOnExceptionLogger extends WebModuleAbstract {
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
index fe9f13b..1bed8aa 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
@@ -41,7 +41,7 @@ import lombok.Getter;
* @since 2.0
*/
@Service
-@Named("isisWebapp.WebModuleTemplateResources")
+@Named("isis.webapp.WebModuleTemplateResources")
@Order(OrderPrecedence.MIDPOINT - 100)
@Qualifier("TemplateResources")
public final class WebModuleTemplateResources extends WebModuleAbstract {
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
index 804c047..bc8e6e8 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
@@ -39,7 +39,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Configuration
-@Named("isisMapCors.WebModuleServerCors")
+@Named("isis.ext.cors.WebModuleServerCors")
@Qualifier("CORS")
@Log4j2
public class IsisModuleExtCorsImpl {
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
index 335789f..abf2072 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
@@ -59,7 +59,7 @@ import lombok.SneakyThrows;
* @deprecated
*/
@Service
-@Named("isisLegacyApplib.domainObjectContainer")
+@Named("isis.legacy.applib.DomainObjectContainer")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnSettings.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnSettings.java
index 00a2b0f..0efb8dc 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnSettings.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnSettings.java
@@ -26,9 +26,9 @@ import javax.inject.Named;
import org.datanucleus.PropertyNames;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.collections._Maps;
@@ -39,8 +39,8 @@ import lombok.extern.log4j.Log4j2;
/**
* @since 2.0
*/
-@Service
-@Named("isisJdoDn.DnSettings")
+@Configuration
+@Named("isis.persistence.jdo.DnSettings")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/jdosupport/JdoSupportServiceDefault.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/jdosupport/JdoSupportServiceDefault.java
index dd13a4d..2e6842c 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/jdosupport/JdoSupportServiceDefault.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/jdosupport/JdoSupportServiceDefault.java
@@ -56,14 +56,8 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
import lombok.val;
-
-/**
- * This service provides a number of utility methods to supplement/support
- * the capabilities of the JDO Objectstore.
- *
- */
@Service
-@Named("isisJdoDn.JdoSupportServiceDefault")
+@Named("isis.persistence.jdo.JdoSupportServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("DN5")
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/schema/JdoSchemaService.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/schema/JdoSchemaService.java
index d88a7b6..8d22bb4 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/schema/JdoSchemaService.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/schema/JdoSchemaService.java
@@ -46,7 +46,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Service
-@Named("isisJdoDn.JdoSchemaService")
+@Named("isis.persistence.jdo.JdoSchemaService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/metamodel/JpaEntityFacetFactory.java b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/metamodel/JpaEntityFacetFactory.java
index 0914cdd..10d6f2a 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/metamodel/JpaEntityFacetFactory.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/metamodel/JpaEntityFacetFactory.java
@@ -54,7 +54,9 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
+@Log4j2
public class JpaEntityFacetFactory extends FacetFactoryAbstract {
public JpaEntityFacetFactory() {
@@ -230,6 +232,9 @@ public class JpaEntityFacetFactory extends FacetFactoryAbstract {
}
val entityManager = getEntityManager();
+
+ log.debug("about to persist entity {}", pojo);
+
entityManager.persist(pojo);
}
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
index 39f001e..bc18ea2 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstra
* Implementation that bypasses authentication.
*/
@Service
-@Named("isisSecurityBypass.AuthenticatorBypass")
+@Named("isis.security.AuthenticatorBypass")
@Order(OrderPrecedence.LATE)
@Qualifier("Bypass")
public class AuthenticatorBypass extends AuthenticatorAbstract {
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
index 2aa21b2..ad6cd1c 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.security.authorization.standard.Authorizor;
@Service
-@Named("isisSecurityBypass.AuthorizorBypass")
+@Named("isis.security.AuthorizorBypass")
@Order(OrderPrecedence.LATE)
@Qualifier("Bypass")
public class AuthorizorBypass implements Authorizor {
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
index 1278fa6..fcf152e 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.security.authentication.AuthenticationContext;
import org.apache.isis.core.security.authentication.standard.Authenticator;
@Service
-@Named("isisSecurityKeycloak.AuthenticatorKeycloak")
+@Named("isis.security.AuthenticatorKeycloak")
@Order(OrderPrecedence.EARLY)
@Qualifier("Keycloak")
@Singleton
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
index df86cf4..19b8f06 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.security.authorization.standard.Authorizor;
@Service
-@Named("isisSecurityKeycloak.AuthorizorKeycloak")
+@Named("isis.security.AuthorizorKeycloak")
@Order(OrderPrecedence.EARLY)
@Qualifier("Keycloak")
public class AuthorizorKeycloak implements Authorizor {
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
index d90cd9c..75c2b2c 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
@@ -39,7 +39,7 @@ import lombok.Getter;
* WebModule to enable support for Keycloak.
*/
@Service
-@Named("isisSecurityKeycloak.WebModuleKeycloak")
+@Named("isis.security.WebModuleKeycloak")
@Order(OrderPrecedence.FIRST + 100)
@Qualifier("Keycloak")
public final class WebModuleKeycloak extends WebModuleAbstract {
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
index 697f568..4eb0695 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
@@ -71,7 +71,7 @@ import lombok.extern.log4j.Log4j2;
* </p>
*/
@Service
-@Named("isisSecurityShiro.AuthenticatorShiro")
+@Named("isis.security.AuthenticatorShiro")
@Order(OrderPrecedence.EARLY)
@Qualifier("Shiro")
@Log4j2
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
index 3fea341..8045e7c 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
@@ -54,7 +54,7 @@ import lombok.val;
* </p>
*/
@Service
-@Named("isisSecurityShiro.AuthorizorShiro")
+@Named("isis.security.AuthorizorShiro")
@Order(OrderPrecedence.EARLY)
@Qualifier("Shiro")
public class AuthorizorShiro implements Authorizor {
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index 55b6f6a..12b50c0 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -64,7 +64,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0
*/
@Service
-@Named("isisSecurityShiro.WebModuleShiro")
+@Named("isis.security.WebModuleShiro")
@Order(OrderPrecedence.FIRST + 200)
@Qualifier("Shiro")
@Log4j2