You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/06 12:03:38 UTC
[isis] branch master updated (21f2c1d -> 52859c7)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 21f2c1d ISIS-2177: remove Oid.copy() (Oid is immutable)
new 57fbbe7 ISIS-2216: adds some smoke tests to confirm interaction between @Order, @Primary and @Qualifier
new d0f3491 ISIS-2216: changes capitalization of @Named("..")
new 1df34a5 ISIS-2216: adds @Named for AuthenticationManagerStandard
new 87e20dc ISIS-2216: removes unnecessary @Import for IsisModuleSecurity{Shiro/Keycloak}
new 52859c7 ISIS-2216: deprecates NatureOfService#DOMAIN .... just use @Service instead
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../isis/applib/annotation/NatureOfService.java | 18 +++--
.../isis/applib/mixins/dto/DtoMappingHelper.java | 2 +-
.../services/audit/AuditerServiceLogging.java | 2 +-
.../isis/applib/services/clock/ClockService.java | 2 +-
.../applib/services/command/CommandContext.java | 2 +-
.../services/confview/ConfigurationMenu.java | 11 +--
.../ContentMappingServiceForCommandDto.java | 4 +-
.../ContentMappingServiceForCommandsDto.java | 2 +-
.../applib/services/iactn/InteractionContext.java | 2 +-
.../applib/services/jaxb/JaxbServiceDefault.java | 2 +-
.../applib/services/layout/LayoutServiceMenu.java | 7 +-
.../services/metamodel/MetaModelServicesMenu.java | 9 +--
.../services/publish/PublisherServiceLogging.java | 2 +-
.../QueryResultsCacheInternal.java | 2 +-
.../applib/services/scratchpad/Scratchpad.java | 2 +-
.../services/swagger/SwaggerServiceMenu.java | 9 +--
.../services/tablecol/TableColumnOrderService.java | 2 +-
.../UrlEncodingServiceWithCompression.java | 2 +-
.../environment/IsisSystemEnvironment.java | 2 +-
.../org/apache/isis/config/IsisConfiguration.java | 2 +-
.../IsisBeanFactoryPostProcessorForSpring.java | 2 +-
.../config/viewer/wicket/WebAppConfiguration.java | 2 +-
.../isis/metamodel/context/MetaModelContexts.java | 2 +-
.../objectmanager/ObjectManagerDefault.java | 2 +-
.../ProgrammingModelInitFilterDefault.java | 2 +-
.../metamodel/services/ServiceInjectorDefault.java | 2 +-
.../appfeat/ApplicationFeatureFactory.java | 2 +-
.../ApplicationFeatureRepositoryDefault.java | 2 +-
.../classsubstitutor/ClassSubstitutorDefault.java | 2 +-
.../services/events/MetamodelEventService.java | 2 +-
.../events/MetamodelEventSupport_Spring.java | 2 +-
.../exceprecog/ExceptionRecognizerDocDefault.java | 2 +-
.../services/grid/GridLoaderServiceDefault.java | 2 +-
.../services/grid/GridReaderUsingJaxb.java | 2 +-
.../services/grid/GridServiceDefault.java | 2 +-
.../grid/bootstrap3/GridSystemServiceBS3.java | 2 +-
.../services/layout/LayoutServiceDefault.java | 2 +-
.../metamodel/MetaModelServiceDefault.java | 2 +-
.../services/registry/ServiceRegistryDefault.java | 2 +-
.../swagger/internal/ClassExcluderDefault.java | 2 +-
.../swagger/internal/SwaggerSpecGenerator.java | 2 +-
.../services/swagger/internal/TaggerDefault.java | 2 +-
.../internal/ValuePropertyFactoryDefault.java | 2 +-
.../services/title/TitleServiceDefault.java | 2 +-
.../services/user/UserServiceDefault.java | 4 +-
.../specloader/InjectorMethodEvaluatorDefault.java | 2 +-
.../specloader/ProgrammingModelServiceDefault.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 2 +-
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 10 +--
...etDerivedFromDomainServiceFacetFactoryTest.java | 2 +-
...etDerivedFromDomainServiceFacetFactoryTest.java | 4 +-
.../datanucleus/DataNucleusSettings.java | 2 +-
...eptionRecognizerCompositeForJdoObjectStore.java | 2 +-
.../metrics/MetricsServiceDefault.java | 2 +-
.../auth/AuthenticationSessionProviderDefault.java | 2 +-
.../auth/AuthorizationManagerStandard.java | 4 +-
.../background/CommandExecutorServiceDefault.java | 2 +-
.../bookmarks/BookmarkServiceInternalDefault.java | 2 +-
.../command/CommandDtoServiceInternalDefault.java | 2 +-
.../services/command/CommandServiceDefault.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../services/email/EmailServiceDefault.java | 2 +-
.../services/eventbus/EventBusServiceSpring.java | 2 +-
.../services/factory/FactoryServiceDefault.java | 2 +-
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../services/i18n/po/TranslationServicePo.java | 2 +-
.../services/i18n/po/TranslationServicePoMenu.java | 9 +--
.../ixn/InteractionDtoServiceInternalDefault.java | 2 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../services/message/MessageServiceDefault.java | 2 +-
.../publish/PublishingServiceInternalDefault.java | 2 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../services/routing/RoutingServiceDefault.java | 2 +-
.../sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../runtime/services/sudo/SudoServiceDefault.java | 2 +-
.../userprof/UserProfileServiceDefault.java | 2 +-
.../userreg/EmailNotificationServiceDefault.java | 2 +-
.../services/wrapper/WrapperFactoryDefault.java | 2 +-
.../services/xactn/TransactionServiceSpring.java | 2 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 2 +-
.../ObjectAdapterMementoServiceDefault.java | 2 +-
.../context/session/RuntimeEventService.java | 2 +-
.../session/RuntimeEventSupport_Spring.java | 2 +-
.../events/PersistenceEventService.java | 2 +-
.../events/PersistenceEventService_Spring.java | 2 +-
.../persistence/events/TimestampService.java | 2 +-
.../system/session/IsisSessionFactoryDefault.java | 2 +-
.../transaction/AuditingServiceInternal.java | 2 +-
.../transaction/ChangedObjectsServiceInternal.java | 2 +-
.../standard/AuthenticationManagerStandard.java | 4 +
.../keycloak/IsisModuleSecurityKeycloak.java | 1 -
.../security/shiro/IsisModuleSecurityShiro.java | 1 -
.../acceptheader/AcceptHeaderServiceForRest.java | 2 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../ContentNegotiationServiceOrgApacheIsisV1.java | 2 +-
.../viewer/webmodule/WebModuleRestfulObjects.java | 2 +-
.../viewer/services/BookmarkUiServiceWicket.java | 2 +-
.../services/HintStoreUsingWicketSession.java | 2 +-
.../SpringServiceInjectOrderTest.java | 89 ++++++++++++++++------
100 files changed, 200 insertions(+), 154 deletions(-)
[isis] 04/05: ISIS-2216: removes unnecessary @Import for
IsisModuleSecurity{Shiro/Keycloak}
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 87e20dc32773af03fea18b47e7dd6e57d2b1e520
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 6 11:05:08 2019 +0000
ISIS-2216: removes unnecessary @Import for IsisModuleSecurity{Shiro/Keycloak}
---
.../org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java | 1 -
.../java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index 351131f..4610c5c 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -41,7 +41,6 @@ import org.apache.isis.security.api.authorization.standard.Authorizor;
@Configuration
@Import({
// modules
- IsisModuleSecurityApi.class,
IsisModuleRuntimeServices.class,
IsisModuleWebapp.class,
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index a50c681..49927a1 100644
--- a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
@@ -41,7 +41,6 @@ import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
@Configuration
@Import({
// modules
- IsisModuleSecurityApi.class,
IsisModuleRuntimeServices.class,
IsisModuleWebapp.class,
[isis] 02/05: ISIS-2216: changes capitalization of @Named("..")
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d0f3491a345d12e9cbf9ac83ae002c0f4a167751
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 6 11:04:21 2019 +0000
ISIS-2216: changes capitalization of @Named("..")
and ensures that all @DomainService(...) are also @Named
---
.../org/apache/isis/applib/mixins/dto/DtoMappingHelper.java | 2 +-
.../isis/applib/services/audit/AuditerServiceLogging.java | 2 +-
.../org/apache/isis/applib/services/clock/ClockService.java | 2 +-
.../apache/isis/applib/services/command/CommandContext.java | 2 +-
.../isis/applib/services/confview/ConfigurationMenu.java | 11 ++++-------
.../conmap/command/ContentMappingServiceForCommandDto.java | 4 ++--
.../conmap/command/ContentMappingServiceForCommandsDto.java | 2 +-
.../apache/isis/applib/services/iactn/InteractionContext.java | 2 +-
.../apache/isis/applib/services/jaxb/JaxbServiceDefault.java | 2 +-
.../apache/isis/applib/services/layout/LayoutServiceMenu.java | 7 +++----
.../isis/applib/services/metamodel/MetaModelServicesMenu.java | 9 ++++-----
.../isis/applib/services/publish/PublisherServiceLogging.java | 2 +-
.../services/queryresultscache/QueryResultsCacheInternal.java | 2 +-
.../apache/isis/applib/services/scratchpad/Scratchpad.java | 2 +-
.../isis/applib/services/swagger/SwaggerServiceMenu.java | 9 ++++-----
.../applib/services/tablecol/TableColumnOrderService.java | 2 +-
.../urlencoding/UrlEncodingServiceWithCompression.java | 2 +-
.../commons/internal/environment/IsisSystemEnvironment.java | 2 +-
.../main/java/org/apache/isis/config/IsisConfiguration.java | 2 +-
.../config/beans/IsisBeanFactoryPostProcessorForSpring.java | 2 +-
.../apache/isis/config/viewer/wicket/WebAppConfiguration.java | 2 +-
.../org/apache/isis/metamodel/context/MetaModelContexts.java | 2 +-
.../isis/metamodel/objectmanager/ObjectManagerDefault.java | 2 +-
.../progmodel/ProgrammingModelInitFilterDefault.java | 2 +-
.../isis/metamodel/services/ServiceInjectorDefault.java | 2 +-
.../metamodel/services/appfeat/ApplicationFeatureFactory.java | 2 +-
.../services/appfeat/ApplicationFeatureRepositoryDefault.java | 2 +-
.../services/classsubstitutor/ClassSubstitutorDefault.java | 2 +-
.../isis/metamodel/services/events/MetamodelEventService.java | 2 +-
.../services/events/MetamodelEventSupport_Spring.java | 2 +-
.../services/exceprecog/ExceptionRecognizerDocDefault.java | 2 +-
.../metamodel/services/grid/GridLoaderServiceDefault.java | 2 +-
.../isis/metamodel/services/grid/GridReaderUsingJaxb.java | 2 +-
.../isis/metamodel/services/grid/GridServiceDefault.java | 2 +-
.../services/grid/bootstrap3/GridSystemServiceBS3.java | 2 +-
.../isis/metamodel/services/layout/LayoutServiceDefault.java | 2 +-
.../metamodel/services/metamodel/MetaModelServiceDefault.java | 2 +-
.../metamodel/services/registry/ServiceRegistryDefault.java | 2 +-
.../services/swagger/internal/ClassExcluderDefault.java | 2 +-
.../services/swagger/internal/SwaggerSpecGenerator.java | 2 +-
.../metamodel/services/swagger/internal/TaggerDefault.java | 2 +-
.../swagger/internal/ValuePropertyFactoryDefault.java | 2 +-
.../isis/metamodel/services/title/TitleServiceDefault.java | 2 +-
.../isis/metamodel/services/user/UserServiceDefault.java | 4 ++--
.../metamodel/specloader/InjectorMethodEvaluatorDefault.java | 2 +-
.../metamodel/specloader/ProgrammingModelServiceDefault.java | 2 +-
.../isis/metamodel/specloader/SpecificationLoaderDefault.java | 2 +-
.../layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java | 10 +++++-----
...tributedFacetDerivedFromDomainServiceFacetFactoryTest.java | 2 +-
...viceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java | 4 ++--
.../jdo/datanucleus5/datanucleus/DataNucleusSettings.java | 2 +-
.../ExceptionRecognizerCompositeForJdoObjectStore.java | 2 +-
.../jdo/datanucleus5/metrics/MetricsServiceDefault.java | 2 +-
.../services/auth/AuthenticationSessionProviderDefault.java | 2 +-
.../runtime/services/auth/AuthorizationManagerStandard.java | 4 +++-
.../services/background/CommandExecutorServiceDefault.java | 2 +-
.../services/bookmarks/BookmarkServiceInternalDefault.java | 2 +-
.../services/command/CommandDtoServiceInternalDefault.java | 2 +-
.../isis/runtime/services/command/CommandServiceDefault.java | 2 +-
.../services/confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../isis/runtime/services/email/EmailServiceDefault.java | 2 +-
.../isis/runtime/services/eventbus/EventBusServiceSpring.java | 2 +-
.../isis/runtime/services/factory/FactoryServiceDefault.java | 2 +-
.../services/homepage/HomePageResolverServiceDefault.java | 2 +-
.../isis/runtime/services/i18n/po/TranslationServicePo.java | 2 +-
.../runtime/services/i18n/po/TranslationServicePoMenu.java | 9 ++++-----
.../services/ixn/InteractionDtoServiceInternalDefault.java | 2 +-
.../services/menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../services/menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../isis/runtime/services/message/MessageServiceDefault.java | 2 +-
.../services/publish/PublishingServiceInternalDefault.java | 2 +-
.../runtime/services/repository/RepositoryServiceDefault.java | 2 +-
.../isis/runtime/services/routing/RoutingServiceDefault.java | 2 +-
.../services/sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../apache/isis/runtime/services/sudo/SudoServiceDefault.java | 2 +-
.../runtime/services/userprof/UserProfileServiceDefault.java | 2 +-
.../services/userreg/EmailNotificationServiceDefault.java | 2 +-
.../isis/runtime/services/wrapper/WrapperFactoryDefault.java | 2 +-
.../isis/runtime/services/xactn/TransactionServiceSpring.java | 2 +-
.../services/xmlsnapshot/XmlSnapshotServiceDefault.java | 2 +-
.../runtime/memento/ObjectAdapterMementoServiceDefault.java | 2 +-
.../runtime/system/context/session/RuntimeEventService.java | 2 +-
.../system/context/session/RuntimeEventSupport_Spring.java | 2 +-
.../system/persistence/events/PersistenceEventService.java | 2 +-
.../persistence/events/PersistenceEventService_Spring.java | 2 +-
.../runtime/system/persistence/events/TimestampService.java | 2 +-
.../runtime/system/session/IsisSessionFactoryDefault.java | 2 +-
.../runtime/system/transaction/AuditingServiceInternal.java | 2 +-
.../system/transaction/ChangedObjectsServiceInternal.java | 2 +-
.../service/acceptheader/AcceptHeaderServiceForRest.java | 2 +-
.../ContentNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../conneg/ContentNegotiationServiceOrgApacheIsisV1.java | 2 +-
.../viewer/webmodule/WebModuleRestfulObjects.java | 2 +-
.../wicket/viewer/services/BookmarkUiServiceWicket.java | 2 +-
.../wicket/viewer/services/HintStoreUsingWicketSession.java | 2 +-
95 files changed, 118 insertions(+), 123 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
index 15bb192..6f25302 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
@@ -33,7 +33,7 @@ import org.apache.isis.schema.common.v1.OidDto;
import org.springframework.stereotype.Service;
@Service
-@Named("isisApplib.dtoMappingHelper")
+@Named("isisApplib.DtoMappingHelper")
@Log4j2
public class DtoMappingHelper {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
index 83a2f9e..681bcc0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisApplib.auditerServiceLogging")
+@Named("isisApplib.AuditerServiceLogging")
@Log4j2
public class AuditerServiceLogging implements AuditerService {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java b/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
index 17b12b2..88118d7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.clock.Clock;
*
*/
@Service
-@Named("isisApplib.clockService")
+@Named("isisApplib.ClockService")
@Log4j2
public class ClockService {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
index a1e93ea..64fab8c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
* available for use; no further configuration is required.
*/
@Service
-@Named("isisApplib.commandContext")
+@Named("isisApplib.CommandContext")
@RequestScoped
@Log4j2
public class CommandContext {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
index 98759c7..f0967b7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
@@ -22,6 +22,7 @@ package org.apache.isis.applib.services.confview;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.Action;
@@ -32,13 +33,9 @@ import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.SemanticsOf;
-@DomainService(
- nature = NatureOfService.VIEW,
- objectType = "isisApplib.ConfigurationMenu"
- )
-@DomainServiceLayout(
- menuBar = DomainServiceLayout.MenuBar.TERTIARY
- )
+@Named("isisApplib.ConfigurationMenu")
+@DomainService(objectType = "isisApplib.ConfigurationMenu")
+@DomainServiceLayout(menuBar = DomainServiceLayout.MenuBar.TERTIARY)
public class ConfigurationMenu {
public static abstract class ActionDomainEvent
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
index aba3c6f..7aa68b7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
@@ -45,7 +45,7 @@ import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarA
import org.springframework.stereotype.Service;
@Service
-@Named("isisApplib.contentMappingServiceForCommandDto")
+@Named("isisApplib.ContentMappingServiceForCommandDto")
@Log4j2
public class ContentMappingServiceForCommandDto implements ContentMappingService {
@@ -103,7 +103,7 @@ public class ContentMappingServiceForCommandDto implements ContentMappingService
* Uses the SPI infrastructure to copy over standard properties from {@link Command} to {@link CommandDto}.
*/
@Service
- @Named("isisApplib.contentMappingServiceForCommandDto.CopyOverFromCommand")
+ @Named("isisApplib.ContentMappingServiceForCommandDto.CopyOverFromCommand")
// specify quite a high priority since custom processors will probably want to run after this one
// (but can choose to run before if they wish)
@Order(-1000)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
index 019eec9..9729302 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
@@ -34,7 +34,7 @@ import org.apache.isis.schema.cmd.v1.CommandsDto;
import org.springframework.stereotype.Service;
@Service
-@Named("isisApplib.contentMappingServiceForCommandsDto")
+@Named("isisApplib.ContentMappingServiceForCommandsDto")
@Log4j2
public class ContentMappingServiceForCommandsDto implements ContentMappingService {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
index 9ffa47e..9e9726c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.DomainService;
* available for use; no further configuration is required.
*/
@Service
-@Named("isisApplib.interactionContext")
+@Named("isisApplib.InteractionContext")
@RequestScoped
@Log4j2
public class InteractionContext {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
index c391ba4..a03e9c9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
@@ -41,7 +41,7 @@ import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
@Service
-@Named("isisApplib.jaxbServiceDefault")
+@Named("isisApplib.JaxbServiceDefault")
@Log4j2
public class JaxbServiceDefault extends JaxbService.Simple {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
index 6b0cab9..bd2b2c4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
@@ -21,6 +21,7 @@ package org.apache.isis.applib.services.layout;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.Action;
@@ -37,10 +38,8 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.commons.internal.base._Strings;
-@DomainService(
- nature = NatureOfService.VIEW,
- objectType = "isisApplib.LayoutServiceMenu"
- )
+@Named("isisApplib.LayoutServiceMenu")
+@DomainService(objectType = "isisApplib.LayoutServiceMenu")
@DomainServiceLayout(
named = "Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
index bb3b5b8..5aa5066 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
@@ -27,6 +27,7 @@ import java.util.stream.Stream;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.Action;
@@ -47,14 +48,12 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
-@DomainService(
- nature = NatureOfService.VIEW,
- objectType = "isisApplib.MetaModelServicesMenu"
- )
+@Named("isisApplib.MetaModelServicesMenu")
+@DomainService(objectType = "isisApplib.MetaModelServicesMenu")
@DomainServiceLayout(
named = "Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
- )
+)
public class MetaModelServicesMenu {
public static abstract class ActionDomainEvent extends IsisModuleApplib.ActionDomainEvent<MetaModelServicesMenu> { }
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
index 09899b2..8d87040 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
@@ -31,7 +31,7 @@ import lombok.extern.log4j.Log4j2;
import javax.inject.Named;
@Service
-@Named("isisApplib.publisherServiceLogging")
+@Named("isisApplib.PublisherServiceLogging")
@Log4j2
public class PublisherServiceLogging implements PublisherService {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
index 4c4e6b9..fa88193 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
@@ -47,7 +47,7 @@ import lombok.extern.log4j.Log4j2;
* available for use; no further configuration is required.
*/
@Service
-@Named("isisApplib.queryResultsCacheInternal")
+@Named("isisApplib.QueryResultsCacheInternal")
@RequestScoped
@Log4j2
public class QueryResultsCacheInternal implements QueryResultsCache, WithTransactionScope {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java b/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
index 8d33f13..0b17e50 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Service;
*/
@Service
@RequestScoped
-@Named("isisApplib.scratchpad")
+@Named("isisApplib.Scratchpad")
@Log4j2
public class Scratchpad {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
index 9b5e883..5d628c2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.services.swagger;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.Action;
@@ -36,14 +37,12 @@ import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.commons.internal.resources._Resources;
-@DomainService(
- nature = NatureOfService.VIEW,
- objectType = "isisApplib.SwaggerServiceMenu"
- )
+@Named("isisApplib.SwaggerServiceMenu")
+@DomainService(objectType = "isisApplib.SwaggerServiceMenu")
@DomainServiceLayout(
named = "Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
- )
+)
public class SwaggerServiceMenu {
public static abstract class ActionDomainEvent extends IsisModuleApplib.ActionDomainEvent<SwaggerServiceMenu> { }
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java b/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
index 81d65d1..23bd1b8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
@@ -44,7 +44,7 @@ public interface TableColumnOrderService {
* Used as a fallback.
*/
@Service
- @Named("isisApplib.tableColumnOrderService.Default")
+ @Named("isisApplib.TableColumnOrderService.Default")
@Log4j2
public static class Default implements TableColumnOrderService {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
index 4c3a4fa..5e9fb3b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
@@ -31,7 +31,7 @@ import org.apache.isis.commons.internal.base._Strings;
import org.springframework.stereotype.Service;
@Service
-@Named("isisApplib.urlEncodingServiceWithCompression")
+@Named("isisApplib.UrlEncodingServiceWithCompression")
@Log4j2
public class UrlEncodingServiceWithCompression implements UrlEncodingService {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
index 414ba64..1304639 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
@@ -47,7 +47,7 @@ import lombok.extern.log4j.Log4j2;
*/
@Service
@Singleton
-@Named("isisCommons.isisSystemEnvironment")
+@Named("isisCommons.IsisSystemEnvironment")
@Log4j2
public class IsisSystemEnvironment {
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 110435f..0365b25 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -1060,7 +1060,7 @@ public class IsisConfiguration {
}
@Component
- @Named("isisConfig.patternsConverter")
+ @Named("isisConfig.PatternsConverter")
@ConfigurationPropertiesBinding
public static class PatternsConverter implements Converter<String, Map<Pattern, String>> {
@Override
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index d130961..870b262 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -46,7 +46,7 @@ import javax.inject.Named;
*
*/
@Component
-@Named("isisConfig.isisBeanFactoryPostProcessorForSpring")
+@Named("isisConfig.IsisBeanFactoryPostProcessorForSpring")
@Log4j2
public class IsisBeanFactoryPostProcessorForSpring
implements BeanFactoryPostProcessor, IsisBeanTypeRegistryHolder {
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
index e46289d..41de174 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
@@ -41,7 +41,7 @@ import lombok.val;
*/
@Service
@Singleton
-@Named("isisConfig.webAppConfiguration")
+@Named("isisConfig.WebAppConfiguration")
@Log4j2
public class WebAppConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
index 362945b..7bd2e06 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContexts.java
@@ -32,7 +32,7 @@ import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
*
*/
@Configuration
-@Named("isisMetaModel.metaModelContexts")
+@Named("isisMetaModel.MetaModelContexts")
public class MetaModelContexts {
@Bean @Singleton
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/ObjectManagerDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/ObjectManagerDefault.java
index 045d1dc..71ad5f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/ObjectManagerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/ObjectManagerDefault.java
@@ -40,7 +40,7 @@ import lombok.val;
*
*/
@Service
-@Named("isisMetaModel.objectManagerDefault")
+@Named("isisMetaModel.ObjectManagerDefault")
@Log4j2
public class ObjectManagerDefault implements ObjectManager {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 1badfc2..9967aa1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -41,7 +41,7 @@ import lombok.val;
*
*/
@Component
-@Named("isisMetaModel.programmingModelInitFilterDefault")
+@Named("isisMetaModel.ProgrammingModelInitFilterDefault")
@Log4j2
public class ProgrammingModelInitFilterDefault implements ProgrammingModelInitFilter {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
index 8fdd696..42afb6d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
*
*/
@Service
-@Named("isisMetaModel.serviceInjectorDefault")
+@Named("isisMetaModel.ServiceInjectorDefault")
@Log4j2
public class ServiceInjectorDefault implements ServiceInjector {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureFactory.java
index 0d84e7a..39b013a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureFactory.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
@Service
@Log4j2
-@Named("isisMetaModel.applicationFeatureFactory")
+@Named("isisMetaModel.ApplicationFeatureFactory")
public class ApplicationFeatureFactory {
public ApplicationFeature newApplicationFeature() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 5649153..70a3897 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -66,7 +66,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Repository
-@Named("isisMetaModel.applicationFeatureRepositoryDefault")
+@Named("isisMetaModel.ApplicationFeatureRepositoryDefault")
@Log4j2
public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRepository {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
index 44bd9a1..d08ea6a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
@@ -26,7 +26,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
@Component
-@Named("isisMetaModel.classSubstitutorDefault")
+@Named("isisMetaModel.ClassSubstitutorDefault")
@Log4j2
public class ClassSubstitutorDefault extends ClassSubstitutorAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventService.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventService.java
index 30e2236..448de73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventService.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventService.java
@@ -42,7 +42,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Service
-@Named("isisMetaModel.metamodelEventService")
+@Named("isisMetaModel.MetamodelEventService")
@Log4j2
@Builder //for JUnit Test support
public class MetamodelEventService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
index 2c5a4a2..5c230b7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/events/MetamodelEventSupport_Spring.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.events.ui.TitleUiEvent;
import org.apache.isis.commons.internal.ioc.spring._Spring;
@Configuration
-@Named("isisMetaModel.metamodelEventSupport_Spring")
+@Named("isisMetaModel.MetamodelEventSupport_Spring")
public class MetamodelEventSupport_Spring {
@Bean
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
index e89cc53..459e2b7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
import org.apache.isis.applib.services.inject.ServiceInjector;
@Service
-@Named("isisMetaModel.exceptionRecognizerDocDefault")
+@Named("isisMetaModel.ExceptionRecognizerDocDefault")
@Log4j2
public class ExceptionRecognizerDocDefault
implements ExceptionRecognizer {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
index b646a12..3f9f563 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -42,7 +42,7 @@ import org.apache.isis.commons.internal.resources._Resources;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisMetaModel.gridLoaderServiceDefault")
+@Named("isisMetaModel.GridLoaderServiceDefault")
@Log4j2
public class GridLoaderServiceDefault implements GridLoaderService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
index 26fa6f6..956b745 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
@@ -42,7 +42,7 @@ import org.apache.isis.commons.internal.collections._Arrays;
*
*/
@Service
-@Named("isisMetaModel.gridReaderUsingJaxb")
+@Named("isisMetaModel.GridReaderUsingJaxb")
@Log4j2
public class GridReaderUsingJaxb {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
index 5b425f7..9d42ef4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridServiceDefault.java
@@ -38,7 +38,7 @@ import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
@Service
-@Named("isisMetaModel.gridServiceDefault")
+@Named("isisMetaModel.GridServiceDefault")
@Log4j2
public class GridServiceDefault implements GridService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index bb9ac21..66a82cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -72,7 +72,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisMetaModel.gridSystemServiceBS3")
+@Named("isisMetaModel.GridSystemServiceBS3")
@Log4j2
public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
index d5f8f11..6b454a9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
@@ -45,7 +45,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisMetaModel.layoutServiceDefault")
+@Named("isisMetaModel.LayoutServiceDefault")
@Log4j2
public class LayoutServiceDefault implements LayoutService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
index 673f94d..dab539a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -56,7 +56,7 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
@Service
-@Named("isisMetaModel.metaModelServiceDefault")
+@Named("isisMetaModel.MetaModelServiceDefault")
@Log4j2
public class MetaModelServiceDefault implements MetaModelService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
index d28b0dd..32f8648 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
@@ -47,7 +47,7 @@ import lombok.val;
* @since 2.0
*/
@Service
-@Named("isisMetaModel.serviceRegistryDefault")
+@Named("isisMetaModel.ServiceRegistryDefault")
@Log4j2
public final class ServiceRegistryDefault implements ServiceRegistry {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderDefault.java
index f796de7..809b230 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.springframework.stereotype.Component;
@Component
-@Named("isisMetaModel.classExcluderDefault")
+@Named("isisMetaModel.ClassExcluderDefault")
@Log4j2
public class ClassExcluderDefault extends ClassExcluderAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/SwaggerSpecGenerator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
index 2d2b928..6209a74 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
@@ -33,7 +33,7 @@ import javax.inject.Inject;
import javax.inject.Named;
@Component
-@Named("isisMetaModel.swaggerSpecGenerator")
+@Named("isisMetaModel.SwaggerSpecGenerator")
@Log4j2
public class SwaggerSpecGenerator {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/TaggerDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/TaggerDefault.java
index 82b250b..027f271 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/TaggerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/TaggerDefault.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.springframework.stereotype.Component;
@Component
-@Named("isisMetaModel.taggerDefault")
+@Named("isisMetaModel.TaggerDefault")
@Log4j2
public class TaggerDefault implements Tagger {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactoryDefault.java
index bb84bb6..c8a9695 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactoryDefault.java
@@ -54,7 +54,7 @@ import lombok.extern.log4j.Log4j2;
import javax.inject.Named;
@Component
-@Named("isisMetaModel.valuePropertyFactoryDefault")
+@Named("isisMetaModel.ValuePropertyFactoryDefault")
@Log4j2
public class ValuePropertyFactoryDefault implements ValuePropertyFactory {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
index 7576747..15ad22b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
@@ -33,7 +33,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisMetaModel.titleServiceDefault")
+@Named("isisMetaModel.TitleServiceDefault")
@Log4j2
public class TitleServiceDefault implements TitleService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
index f91087a..23e5606 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
@@ -40,7 +40,7 @@ import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
@Service
-@Named("isisMetaModel.userServiceDefault")
+@Named("isisMetaModel.UserServiceDefault")
@Log4j2
public class UserServiceDefault implements UserService {
@@ -149,7 +149,7 @@ public class UserServiceDefault implements UserService {
@Service
- @Named("isisMetaModel.userServiceDefault.SudoServiceSpi")
+ @Named("isisMetaModel.UserServiceDefault.SudoServiceSpi")
@Log4j2
public static class SudoServiceSpi implements SudoService.Spi {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/InjectorMethodEvaluatorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/InjectorMethodEvaluatorDefault.java
index 83f0b1d..e158430 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/InjectorMethodEvaluatorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/InjectorMethodEvaluatorDefault.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
@Service
-@Named("isisMetaModel.injectorMethodEvaluatorDefault")
+@Named("isisMetaModel.InjectorMethodEvaluatorDefault")
@Log4j2
public final class InjectorMethodEvaluatorDefault implements InjectorMethodEvaluator {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
index 5660e28..5697862 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
@@ -37,7 +37,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisMetaModel.programmingModelServiceDefault")
+@Named("isisMetaModel.ProgrammingModelServiceDefault")
@Log4j2
public class ProgrammingModelServiceDefault implements ProgrammingModelService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index 96c5846..4f723f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -82,7 +82,7 @@ import static org.apache.isis.commons.internal.base._With.requires;
* </p>
*/
@Service
-@Named("isisMetaModel.specificationLoaderDefault")
+@Named("isisMetaModel.SpecificationLoaderDefault")
@Log4j2
public class SpecificationLoaderDefault implements SpecificationLoader {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
index b375dde..1114f38 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
@@ -59,7 +59,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
public void onDomainServiceForViewWithDefault() {
// given
- @DomainService(nature = NatureOfService.VIEW)
+ @DomainService()
class CustomerService {
@ActionLayout()
@@ -95,7 +95,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
@Test
public void onDomainServiceForViewWithBoth() {
// given
- @DomainService(nature = NatureOfService.VIEW)
+ @DomainService()
class CustomerService {
@ActionLayout(contributed = Contributed.AS_BOTH)
@@ -131,7 +131,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
public void testOnDomainServiceForViewWithAssociation() {
// given
- @DomainService(nature = NatureOfService.VIEW)
+ @DomainService()
class CustomerService {
@ActionLayout(contributed = Contributed.AS_ASSOCIATION)
@@ -171,7 +171,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
public void onDomainServiceForViewWithAction() {
// given
- @DomainService(nature = NatureOfService.VIEW)
+ @DomainService()
class CustomerService {
@ActionLayout(contributed = Contributed.AS_ACTION)
@@ -209,7 +209,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
@Test
public void onDomainServiceForViewWithNeither() {
// given
- @DomainService(nature = NatureOfService.VIEW)
+ @DomainService()
class CustomerService {
@ActionLayout(contributed = Contributed.AS_NEITHER)
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
index 02dc77b..48c07fb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -125,7 +125,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
public void whenView() throws Exception {
// given
- @DomainService(nature = NatureOfService.VIEW)
+ @DomainService()
class CustomerService {
public String name() {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
index 2bded46..7931f1f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -127,7 +127,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
public void whenView() throws Exception {
// given
- @DomainService(nature = NatureOfService.VIEW)
+ @DomainService()
class CustomerService {
public String name() {
@@ -160,7 +160,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
public void whenMenu() throws Exception {
// given
- @DomainService(nature = NatureOfService.VIEW)
+ @DomainService()
class CustomerService {
public String name() {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
index b2d2894..071721b 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
* @since 2.0
*/
@Service
-@Named("isisJdoDn5.dataNucleusSettings")
+@Named("isisJdoDn5.DataNucleusSettings")
public class DataNucleusSettings {
@Inject @Named("dn-settings")
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
index 62d9bd8..6fdf2d1 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -43,7 +43,7 @@ import org.springframework.stereotype.Service;
* </p>
*/
@Service
-@Named("isisJdoDn5.exceptionRecognizerCompositeForJdoObjectStore")
+@Named("isisJdoDn5.ExceptionRecognizerCompositeForJdoObjectStore")
@Log4j2
public class ExceptionRecognizerCompositeForJdoObjectStore extends ExceptionRecognizerComposite {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
index 8d62fb2..b1dc252 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.runtime.system.transaction.ChangedObjectsServiceInternal;
import org.springframework.stereotype.Service;
@Service
-@Named("isisJdoDn5.metricsServiceDefault")
+@Named("isisJdoDn5.MetricsServiceDefault")
@RequestScoped
@Log4j2
public class MetricsServiceDefault implements MetricsService, InstanceLifecycleListener,
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
index 8c6c767..7ae7e4c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
@@ -35,7 +35,7 @@ import org.apache.isis.security.api.authentication.AuthenticationSessionProvider
import org.apache.isis.security.api.authentication.standard.SimpleSession;
@Service
-@Named("isisRuntimeServices.authenticationSessionProviderDefault")
+@Named("isisRuntimeServices.AuthenticationSessionProviderDefault")
@Log4j2
public class AuthenticationSessionProviderDefault implements AuthenticationSessionProvider {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthorizationManagerStandard.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthorizationManagerStandard.java
index ed426bd..066fa3f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthorizationManagerStandard.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthorizationManagerStandard.java
@@ -36,10 +36,12 @@ import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
import org.apache.isis.security.api.authorization.standard.Authorizor;
+import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisRuntimeServices.authorizationManagerStandard")
+@Named("isisRuntimeServices.AuthorizationManagerStandard")
+@Log4j2
public class AuthorizationManagerStandard implements AuthorizationManager, MetaModelRefiner {
@Inject protected Authorizor authorizor;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
index 18f505c..5122efd 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutorServiceDefault.java
@@ -71,7 +71,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRuntimeServices.commandExecutorServiceDefault")
+@Named("isisRuntimeServices.CommandExecutorServiceDefault")
@Log4j2
public class CommandExecutorServiceDefault implements CommandExecutorService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
index a6d6efa..6b92143 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -52,7 +52,7 @@ import lombok.val;
*
*/
@Service
-@Named("isisRuntimeServices.bookmarkServiceInternalDefault")
+@Named("isisRuntimeServices.BookmarkServiceInternalDefault")
@Log4j2
public class BookmarkServiceInternalDefault implements BookmarkService, SerializingAdapter {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
index 7d1b0d2..f5e38c8 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -54,7 +54,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisRuntimeServices.commandDtoServiceInternalDefault")
+@Named("isisRuntimeServices.CommandDtoServiceInternalDefault")
@Log4j2
public class CommandDtoServiceInternalDefault implements CommandDtoServiceInternal {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
index 785c931..a495969 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.command.CommandDefault;
import org.apache.isis.applib.services.command.spi.CommandService;
@Service
-@Named("isisRuntimeServices.commandServiceDefault")
+@Named("isisRuntimeServices.CommandServiceDefault")
@Log4j2
public class CommandServiceDefault implements CommandService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
index 726771f..1f68bd1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
@@ -46,7 +46,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0
*/
@Service
-@Named("isisRuntimeServices.configurationViewServiceDefault")
+@Named("isisRuntimeServices.ConfigurationViewServiceDefault")
@Log4j2
public class ConfigurationViewServiceDefault implements ConfigurationViewService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
index 88428cc..ddf669a 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
@@ -45,7 +45,7 @@ import lombok.extern.log4j.Log4j2;
* A service that sends email notifications when specific events occur
*/
@Service
-@Named("isisRuntimeServices.emailServiceDefault")
+@Named("isisRuntimeServices.EmailServiceDefault")
@Log4j2
public class EmailServiceDefault implements EmailService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
index df13c65..9e59533 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.eventbus.EventBusService;
@Service
-@Named("isisRuntimeServices.eventBusServiceSpring")
+@Named("isisRuntimeServices.EventBusServiceSpring")
@Log4j2
public class EventBusServiceSpring implements EventBusService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
index f094e51..05ecdac 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
@@ -45,7 +45,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisRuntimeServices.factoryServiceDefault")
+@Named("isisRuntimeServices.FactoryServiceDefault")
@Log4j2
public class FactoryServiceDefault implements FactoryService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
index f10b0a1..c0dc63c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
@@ -50,7 +50,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisRuntimeServices.homePageResolverServiceDefault")
+@Named("isisRuntimeServices.HomePageResolverServiceDefault")
@Log4j2
public class HomePageResolverServiceDefault implements HomePageResolverService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
index ead431f..6dccb39 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
@@ -37,7 +37,7 @@ import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
@Service
-@Named("isisRuntimeServices.translationServicePo")
+@Named("isisRuntimeServices.TranslationServicePo")
@Log4j2
public class TranslationServicePo implements TranslationService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java
index ba08593..7db7044 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java
@@ -19,6 +19,7 @@
package org.apache.isis.runtime.services.i18n.po;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.Action;
@@ -32,14 +33,12 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.value.Clob;
-@DomainService(
- nature = NatureOfService.VIEW,
- objectType = "isisApplib.TranslationServicePoMenu"
- )
+@Named("isisApplib.TranslationServicePoMenu")
+@DomainService(objectType = "isisApplib.TranslationServicePoMenu")
@DomainServiceLayout(
named = "Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
- )
+)
public class TranslationServicePoMenu {
public static abstract class ActionDomainEvent extends IsisModuleApplib.ActionDomainEvent<TranslationServicePoMenu> {}
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
index f2776ac..0d29994 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
@@ -50,7 +50,7 @@ import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import org.springframework.stereotype.Service;
@Service
-@Named("isisRuntimeServices.interactionDtoServiceInternalDefault")
+@Named("isisRuntimeServices.InteractionDtoServiceInternalDefault")
@Log4j2
public class InteractionDtoServiceInternalDefault implements InteractionDtoServiceInternal {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
index 059b176..36ba7ec 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
@@ -39,7 +39,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRuntimeServices.menuBarsLoaderServiceDefault")
+@Named("isisRuntimeServices.MenuBarsLoaderServiceDefault")
@Log4j2
public class MenuBarsLoaderServiceDefault implements MenuBarsLoaderService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
index 78af2ae..9d3ad65 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -64,7 +64,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRuntimeServices.menuBarsServiceBS3")
+@Named("isisRuntimeServices.MenuBarsServiceBS3")
@Log4j2
public class MenuBarsServiceBS3 implements MenuBarsService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
index 065df63..2337862 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
@@ -33,7 +33,7 @@ import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.MessageBroker;
@Service
-@Named("isisRuntimeServices.messageServiceDefault")
+@Named("isisRuntimeServices.MessageServiceDefault")
@Log4j2
public class MessageServiceDefault implements MessageService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishingServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishingServiceInternalDefault.java
index 64fadf3..80185f4 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishingServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishingServiceInternalDefault.java
@@ -56,7 +56,7 @@ import org.springframework.stereotype.Service;
*/
@Service
@RequestScoped
-@Named("isisRuntimeServices.publishingServiceInternalDefault")
+@Named("isisRuntimeServices.PublishingServiceInternalDefault")
@Log4j2
public class PublishingServiceInternalDefault implements PublishingServiceInternal {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
index abe0dc2..8b9d977 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
@@ -52,7 +52,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Repository
-@Named("isisRuntimeServices.repositoryServiceDefault")
+@Named("isisRuntimeServices.RepositoryServiceDefault")
@Log4j2
public class RepositoryServiceDefault implements RepositoryService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
index 961da63..52ea0c2 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
@@ -31,7 +31,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Controller
-@Named("isisRuntimeServices.routingServiceDefault")
+@Named("isisRuntimeServices.RoutingServiceDefault")
@Log4j2
public class RoutingServiceDefault implements RoutingService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index 5578146..40c49a69 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -32,7 +32,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisRuntimeServices.sessionManagementServiceDefault")
+@Named("isisRuntimeServices.SessionManagementServiceDefault")
@Log4j2
public class SessionManagementServiceDefault implements SessionManagementService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
index e834da4..904ca59 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.sudo.SudoService;
import org.springframework.stereotype.Service;
@Service
-@Named("isisRuntimeServices.sudoServiceDefault")
+@Named("isisRuntimeServices.SudoServiceDefault")
@Log4j2
public class SudoServiceDefault implements SudoService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
index 5a32fea..b31f8d4 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.security.api.authentication.AuthenticationSessionProvider
import org.springframework.stereotype.Service;
@Service
-@Named("isisRuntimeServices.userProfileServiceDefault")
+@Named("isisRuntimeServices.UserProfileServiceDefault")
@Log4j2
public class UserProfileServiceDefault implements UserProfileService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
index 904dbfd..126d4a3 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
@@ -47,7 +47,7 @@ import static java.util.regex.Pattern.quote;
* A service that sends email notifications when specific events occur
*/
@Service
-@Named("isisRuntimeServices.emailNotificationServiceDefault")
+@Named("isisRuntimeServices.EmailNotificationServiceDefault")
@Log4j2
public class EmailNotificationServiceDefault implements EmailNotificationService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
index a990511..c85d373 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
@@ -76,7 +76,7 @@ import lombok.extern.log4j.Log4j2;
* the Isis programming model.
*/
@Service
-@Named("isisRuntimeServices.wrapperFactoryDefault")
+@Named("isisRuntimeServices.WrapperFactoryDefault")
@Log4j2
public class WrapperFactoryDefault implements WrapperFactory {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
index 5f8d19e..8d2cc97 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
@@ -42,7 +42,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRuntimeServices.transactionServiceSpring")
+@Named("isisRuntimeServices.TransactionServiceSpring")
@Log4j2
public class TransactionServiceSpring implements TransactionService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
index c02d89f..ba0662a 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -41,7 +41,7 @@ import org.apache.isis.metamodel.util.snapshot.XmlSnapshot;
* that it is automatically registered and available for use; no further configuration is required.
*/
@Service
-@Named("isisRuntimeServices.xmlSnapshotServiceDefault")
+@Named("isisRuntimeServices.XmlSnapshotServiceDefault")
@Log4j2
public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMementoServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMementoServiceDefault.java
index d81326a..701bc0d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMementoServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMementoServiceDefault.java
@@ -45,7 +45,7 @@ import lombok.val;
*
*/
@Service
-@Named("isisRuntime.objectAdapterMementoServiceDefault")
+@Named("isisRuntime.ObjectAdapterMementoServiceDefault")
@Singleton
@Log4j2
public class ObjectAdapterMementoServiceDefault
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventService.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventService.java
index 7361f21..656305d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventService.java
@@ -33,7 +33,7 @@ import org.apache.isis.runtime.system.session.IsisSession;
* post-construct phase has finished and before the pre-destroy phase has begun.
*/
@Service
-@Named("isisRuntime.runtimeEventService")
+@Named("isisRuntime.RuntimeEventService")
public class RuntimeEventService {
@Inject private EventBusService eventBusService;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java
index 739b90d..b8f579f 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
import org.apache.isis.commons.internal.ioc.spring._Spring;
@Configuration
-@Named("isisRuntime.runtimeEventSupport_Spring")
+@Named("isisRuntime.RuntimeEventSupport_Spring")
public class RuntimeEventSupport_Spring {
@Bean
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService.java
index 454d2c4..76dfa08 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
*
*/
@Service
-@Named("isisRuntime.persistenceEventService")
+@Named("isisRuntime.PersistenceEventService")
public class PersistenceEventService {
// -- MANAGED EVENTS
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService_Spring.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService_Spring.java
index 1f75b09..8d81804 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/PersistenceEventService_Spring.java
@@ -33,7 +33,7 @@ import org.apache.isis.commons.internal.ioc.spring._Spring;
*
*/
@Configuration
-@Named("isisRuntime.persistenceEventService_Spring")
+@Named("isisRuntime.PersistenceEventService_Spring")
public class PersistenceEventService_Spring {
@Bean
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/TimestampService.java
index da39ecb..b7d04a5 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/events/TimestampService.java
@@ -34,7 +34,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisRuntime.timestampService")
+@Named("isisRuntime.TimestampService")
@Log4j2
public class TimestampService {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
index 156dc2a..604a057 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
@@ -64,7 +64,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Service
-@Named("isisRuntime.isisSessionFactoryDefault")
+@Named("isisRuntime.IsisSessionFactoryDefault")
@Log4j2
public class IsisSessionFactoryDefault implements IsisSessionFactory {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AuditingServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AuditingServiceInternal.java
index 8a9ec14..17b5c57 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AuditingServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/AuditingServiceInternal.java
@@ -43,7 +43,7 @@ import lombok.val;
* Wrapper around {@link org.apache.isis.applib.services.audit.AuditerService}.
*/
@Service
-@Named("isisRuntime.auditingServiceInternal")
+@Named("isisRuntime.AuditingServiceInternal")
public class AuditingServiceInternal {
@Inject private List<AuditerService> auditerServices;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsServiceInternal.java
index f94746f..9116b1d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsServiceInternal.java
@@ -44,7 +44,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import lombok.val;
@Service
-@Named("isisRuntime.changedObjectsServiceInternal")
+@Named("isisRuntime.ChangedObjectsServiceInternal")
@RequestScoped
public class ChangedObjectsServiceInternal implements WithTransactionScope {
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
index 076f784..ee28a12 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Service;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
@Service
-@Named("isisRoRendering.acceptHeaderServiceForRest")
+@Named("isisRoRendering.AcceptHeaderServiceForRest")
@RequestScoped
@Log4j2
public class AcceptHeaderServiceForRest implements AcceptHeaderService {
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 3ea86bc..95dcb23 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -65,7 +65,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisRoRendering.contentNegotiationServiceForRestfulObjectsV1_0")
+@Named("isisRoRendering.ContentNegotiationServiceForRestfulObjectsV1_0")
@Log4j2
public class ContentNegotiationServiceForRestfulObjectsV1_0 implements ContentNegotiationService {
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
index adecbff..5f05aa6 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
@@ -55,7 +55,7 @@ import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
-@Named("isisRoRendering.contentNegotiationServiceOrgApacheIsisV1")
+@Named("isisRoRendering.ContentNegotiationServiceOrgApacheIsisV1")
@Order(200) //in effect, is the relative priority (lower numbers have higher priority)
@Log4j2
public class ContentNegotiationServiceOrgApacheIsisV1 extends ContentNegotiationServiceAbstract {
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/WebModuleRestfulObjects.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/WebModuleRestfulObjects.java
index e680d02..3724ab8 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/WebModuleRestfulObjects.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/WebModuleRestfulObjects.java
@@ -51,7 +51,7 @@ import lombok.val;
* @since 2.0
*/
@Service
-@Named("isisRoViewer.webModuleRestfulObjects")
+@Named("isisRoViewer.WebModuleRestfulObjects")
@Order(-80)
@Log4j2
public final class WebModuleRestfulObjects implements WebModule {
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
index 242e40f..af0befd 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
@@ -29,7 +29,7 @@ import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionF
import org.springframework.stereotype.Service;
@Service
-@Named("isisWicketViewer.bookmarkUiServiceWicket")
+@Named("isisWicketViewer.BookmarkUiServiceWicket")
@Log4j2
public class BookmarkUiServiceWicket implements BookmarkUiService {
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
index 36fa649..39125f7 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
@@ -36,7 +36,7 @@ import lombok.extern.log4j.Log4j2;
import javax.inject.Named;
@Service
-@Named("isisWicketViewer.hintStoreUsingWicketSession")
+@Named("isisWicketViewer.HintStoreUsingWicketSession")
@Log4j2
public class HintStoreUsingWicketSession implements HintStore {
[isis] 03/05: ISIS-2216: adds @Named for
AuthenticationManagerStandard
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1df34a52d34452c6a0ced7a8c1960a20c61f8b4c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 6 11:04:41 2019 +0000
ISIS-2216: adds @Named for AuthenticationManagerStandard
---
.../api/authentication/standard/AuthenticationManagerStandard.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticationManagerStandard.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticationManagerStandard.java
index f29920d..eb8f3d6 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticationManagerStandard.java
@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.util.ToString;
@@ -42,9 +43,12 @@ import org.springframework.stereotype.Service;
import static org.apache.isis.commons.internal.base._With.requires;
import lombok.Getter;
+import lombok.extern.log4j.Log4j2;
import lombok.val;
@Service
+@Named("isisSecurityApi.AuthenticationManagerStandard")
+@Log4j2
public class AuthenticationManagerStandard implements AuthenticationManager {
@Inject private ServiceRegistry serviceRegistry;
[isis] 01/05: ISIS-2216: adds some smoke tests to confirm
interaction between @Order, @Primary and @Qualifier
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 57fbbe7934903e42aabd53a98701dd138ec94b63
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 6 10:37:54 2019 +0000
ISIS-2216: adds some smoke tests to confirm interaction between @Order, @Primary and @Qualifier
---
.../SpringServiceInjectOrderTest.java | 89 ++++++++++++++++------
1 file changed, 67 insertions(+), 22 deletions(-)
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index cdb1855..f9945e8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -22,9 +22,11 @@ import java.io.IOException;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Named;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@@ -90,26 +92,32 @@ class SpringServiceInjectOrderTest {
@Service
@Order(1)
+ @Qualifier("tallest")
+ @Named("withExcellentName")
static class Excellent implements Rating {
-
+
@Override
public int getRating() {
return 1;
}
}
-
+
@Service
@Order(2) @Primary
+ @Qualifier("tall")
+ @Named("withGoodName")
static class Good implements Rating {
-
+
@Override
public int getRating() {
return 2;
}
}
-
+
@Service
@Order(Ordered.LOWEST_PRECEDENCE)
+ @Qualifier("middle")
+ @Named("withAverageName")
static class Average implements Rating {
@Override
@@ -123,13 +131,27 @@ class SpringServiceInjectOrderTest {
@Inject @Getter MessageService messageService;
@Inject @Getter List<Rating> ratings;
@Inject @Getter Rating primaryRating;
+ @Inject @Getter Rating someArbitraryRating;
+ @Inject @Getter @Qualifier("tallest") Rating qualifiedRating1;
+ @Inject @Getter @Qualifier("tall") Rating qualifiedRating2;
+ @Inject @Getter @Qualifier("middle") Rating qualifiedRating3;
+ @Inject @Getter Rating tallest;
+ @Inject @Getter Rating mostExcellentName;
+
+ // this doesn't bootstrap, because matching is done using the service's @Qualifier, not the service's @Name
+ // @Inject @Getter @Qualifier("mostExcellentName") Rating namedRating1;
}
@DomainObject
static class DummyObject {
@Inject @Getter MessageService messageService;
@Inject @Getter List<Rating> ratings;
- @Inject @Getter Rating primaryRating;
+ @Inject @Getter Rating someArbitraryRating;
+ @Inject @Getter @Qualifier("tallest") Rating qualifiedRating1;
+ @Inject @Getter @Qualifier("tall") Rating qualifiedRating2;
+ @Inject @Getter @Qualifier("middle") Rating qualifiedRating3;
+ @Inject @Getter Rating tallest;
+ @Inject @Getter Rating mostExcellentName;
}
@@ -150,18 +172,29 @@ class SpringServiceInjectOrderTest {
@Test
void injectionOnServices_shouldFollowOrder() throws IOException {
+ val messageService = dummyService.getMessageService();
+ assertNotNull(messageService);
+ assertTrue(messageService instanceof MessageServiceDefault);
+
+ // injected as per @Order
val ratings = dummyService.getRatings();
- val primaryRating = dummyService.getPrimaryRating();
-
assertThat(ratings.get(0).getRating(), is(equalTo(1)));
assertThat(ratings.get(1).getRating(), is(equalTo(2)));
assertThat(ratings.get(2).getRating(), is(equalTo(3)));
-
- assertThat(primaryRating.getRating(), is(equalTo(2)));
-
- val messageService = dummyService.getMessageService();
- assertNotNull(messageService);
- assertTrue(messageService instanceof MessageServiceDefault);
+
+ // uses the @Primary
+ assertThat(dummyService.getSomeArbitraryRating().getRating(), is(equalTo(2)));
+
+ // does match @Qualifier to @Qualifier
+ assertThat(dummyService.getQualifiedRating1().getRating(), is(equalTo(1)));
+ assertThat(dummyService.getQualifiedRating2().getRating(), is(equalTo(2)));
+ assertThat(dummyService.getQualifiedRating3().getRating(), is(equalTo(3)));
+
+ // does NOT match field name to @Qualifier
+ assertThat(dummyService.getTallest().getRating(), is(equalTo(2))); // rather than '1'... so defaulted to @Primary
+
+ // does NOT match field name to @Qualifier
+ assertThat(dummyService.getMostExcellentName().getRating(), is(equalTo(2))); // rather than '1'... so defaulted to @Primary
}
@Test
@@ -169,19 +202,31 @@ class SpringServiceInjectOrderTest {
val dummyObject = new DummyObject();
serviceInjector.injectServicesInto(dummyObject);
-
+
+ val messageService = dummyObject.getMessageService();
+ assertNotNull(messageService);
+ assertTrue(messageService instanceof MessageServiceDefault);
+
+ // injected as per @Order
val ratings = dummyObject.getRatings();
- val primaryRating = dummyObject.getPrimaryRating();
-
assertThat(ratings.get(0).getRating(), is(equalTo(1)));
assertThat(ratings.get(1).getRating(), is(equalTo(2)));
assertThat(ratings.get(2).getRating(), is(equalTo(3)));
-
- assertThat(primaryRating.getRating(), is(equalTo(2)));
-
- val messageService = dummyObject.getMessageService();
- assertNotNull(messageService);
- assertTrue(messageService instanceof MessageServiceDefault);
+
+ // uses the @Primary
+ assertThat(dummyObject.getSomeArbitraryRating().getRating(), is(equalTo(2)));
+
+ // does match @Qualifier to @Qualifier
+ assertThat(dummyObject.getQualifiedRating1().getRating(), is(equalTo(1)));
+ assertThat(dummyObject.getQualifiedRating2().getRating(), is(equalTo(2)));
+ assertThat(dummyObject.getQualifiedRating3().getRating(), is(equalTo(3)));
+
+ // does NOT match field name to @Qualifier
+ assertThat(dummyObject.getTallest().getRating(), is(equalTo(2))); // rather than '1'... so defaulted to @Primary
+
+ // does NOT match field name to @Qualifier
+ assertThat(dummyObject.getMostExcellentName().getRating(), is(equalTo(2))); // rather than '1'... so defaulted to @Primary
+
}
}
[isis] 05/05: ISIS-2216: deprecates NatureOfService#DOMAIN ....
just use @Service instead
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 52859c7e944ea57754fcd5783523dba750ef1aed
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 6 11:05:33 2019 +0000
ISIS-2216: deprecates NatureOfService#DOMAIN .... just use @Service instead
---
.../apache/isis/applib/annotation/NatureOfService.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
index d22203e..f02c2aa 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
@@ -38,20 +38,24 @@ public enum NatureOfService {
*/
REST,
+ // -- DEPRECATIONS
+
/**
* A <em>programmatic</em> service.
* <p>
- * The service's actions do not appear on any viewer and are not visible in the REST API. In other words
- * these are not contributed to the domain-model. However, the service is injectable into domain objects.
+ * The service's actions do not appear on any viewer and are not visible in the REST API. In other words
+ * these are not contributed to the domain-model. However, the service is injectable into domain objects.
* </p>
+ *
+ * @deprecated will be removed with 2.0.0 release! use Spring's {@link org.springframework.stereotype.Service @Service} instead;
+ * @apiNote For now, used as synonym for {@link #REST}
*/
+ @Deprecated
DOMAIN,
-
- // -- DEPRECATIONS
-
+
/**
- * @deprecated will be removed with 2.0.0 release! use {@link #REST} instead;
- * @apiNote For now, used as synonym for {@link #REST}
+ * @deprecated will be removed with 2.0.0 release! use {@link #REST} instead;
+ * @apiNote For now, used as synonym for {@link #REST}
*/
@Deprecated
VIEW_REST_ONLY,