You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/01/09 09:51:40 UTC
[isis] 05/06: ISIS-2033: removing @ApplicationScoped where
@Singleton is already used
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 38f9eaff12e40f226ec928d21a8a39e01485ffdc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 9 07:18:45 2019 +0100
ISIS-2033: removing @ApplicationScoped where @Singleton is already used
Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
.../org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java | 2 +-
.../services/queryresultscache/QueryResultsCacheControlInternal.java | 2 +-
.../apache/isis/applib/services/routing/RoutingServiceDefault.java | 2 +-
.../isis/config/services/view/ConfigurationViewServiceDefault.java | 2 +-
.../apache/isis/core/metamodel/services/ServiceInjectorDefault.java | 2 +-
.../core/metamodel/services/appfeat/ApplicationFeatureFactory.java | 5 ++---
.../services/appfeat/ApplicationFeatureRepositoryDefault.java | 2 +-
.../metamodel/services/bookmarks/BookmarkServiceInternalDefault.java | 2 +-
.../metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java | 2 +-
.../metamodel/services/factory/FactoryServiceInternalDefault.java | 2 +-
.../isis/core/metamodel/services/grid/GridLoaderServiceDefault.java | 2 +-
.../apache/isis/core/metamodel/services/grid/GridServiceDefault.java | 2 +-
.../metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java | 2 +-
.../isis/core/metamodel/services/layout/LayoutServiceDefault.java | 2 +-
.../core/metamodel/services/metamodel/MetaModelServiceDefault.java | 2 +-
.../core/metamodel/services/registry/ServiceRegistryDefault.java | 2 +-
.../services/repository/RepositoryServiceInternalDefault.java | 2 +-
.../isis/core/metamodel/services/swagger/SwaggerServiceDefault.java | 2 +-
.../isis/core/metamodel/services/title/TitleServiceDefault.java | 2 +-
.../apache/isis/core/metamodel/services/user/UserServiceDefault.java | 2 +-
.../core/metamodel/specloader/InjectorMethodEvaluatorDefault.java | 2 +-
.../runtime/authorization/standard/AuthorizationManagerStandard.java | 2 +-
.../apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java | 2 +-
.../jdo/datanucleus/service/eventbus/EventBusServiceJdo.java | 2 +-
.../apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java | 2 +-
.../jdo/datanucleus/service/eventbus/EventBusServiceJdo.java | 2 +-
.../isis/security/shiro/authentication/ShiroAuthenticator.java | 2 +-
.../apache/isis/security/shiro/authorization/ShiroAuthorizor.java | 2 +-
.../jdo/ExceptionRecognizerCompositeForJdoObjectStore.java | 2 +-
.../isis/core/runtime/services/auditing/AuditingServiceInternal.java | 2 +-
.../services/authsess/AuthenticationSessionProviderDefault.java | 2 +-
.../core/runtime/services/background/BackgroundServiceDefault.java | 2 +-
.../runtime/services/background/CommandExecutorServiceDefault.java | 2 +-
.../runtime/services/command/CommandDtoServiceInternalDefault.java | 2 +-
.../isis/core/runtime/services/command/CommandServiceDefault.java | 2 +-
.../apache/isis/core/runtime/services/email/EmailServiceDefault.java | 2 +-
.../runtime/services/homepage/HomePageProviderServiceDefault.java | 2 +-
.../isis/core/runtime/services/i18n/po/TranslationServicePo.java | 2 +-
.../runtime/services/ixn/InteractionDtoServiceInternalDefault.java | 2 +-
.../core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../isis/core/runtime/services/message/MessageServiceDefault.java | 2 +-
.../persistsession/PersistenceSessionServiceInternalDefault.java | 2 +-
.../runtime/services/sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../apache/isis/core/runtime/services/sudo/SudoServiceDefault.java | 2 +-
.../core/runtime/services/userprof/UserProfileServiceDefault.java | 2 +-
.../runtime/services/userreg/EmailNotificationServiceDefault.java | 2 +-
.../isis/core/runtime/services/xactn/TransactionServiceDefault.java | 2 +-
.../core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java | 2 +-
.../isis/core/runtime/system/session/IsisSessionFactoryDefault.java | 2 +-
.../java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java | 2 +-
.../rendering/service/RepresentationServiceContentNegotiator.java | 2 +-
.../viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java | 2 +-
.../registries/components/ComponentFactoryRegistrarDefault.java | 2 +-
.../registries/components/ComponentFactoryRegistryDefault.java | 2 +-
.../viewer/wicket/viewer/registries/pages/PageClassListDefault.java | 2 +-
.../wicket/viewer/registries/pages/PageClassRegistryDefault.java | 2 +-
.../wicket/viewer/registries/pages/PageNavigationServiceDefault.java | 2 +-
.../isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java | 2 +-
.../wicket/viewer/services/EmailNotificationServiceWicket.java | 2 +-
.../viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java | 2 +-
61 files changed, 62 insertions(+), 63 deletions(-)
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 42d6589..6ce25da 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
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.schema.utils.jaxbadapters.PersistentEntitiesAdapter;
import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
-@Singleton @ApplicationScoped
+@Singleton
public class JaxbServiceDefault extends JaxbService.Simple {
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControlInternal.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControlInternal.java
index 3d80268..261ac8e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControlInternal.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControlInternal.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
/**
* In separate class because {@link QueryResultsCache} itself is request-scoped
*/
-@Singleton @ApplicationScoped
+@Singleton
public class QueryResultsCacheControlInternal extends AbstractSubscriber implements QueryResultCacheControl {
@PostConstruct
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
index 18e1fbb..5a90879 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.homepage.HomePageProviderService;
-@Singleton @ApplicationScoped
+@Singleton
public class RoutingServiceDefault implements RoutingService {
// private final static Logger LOG = LoggerFactory.getLogger(RoutingServiceDefault.class);
diff --git a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewServiceDefault.java b/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewServiceDefault.java
index 6631bd0..4341885 100644
--- a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewServiceDefault.java
+++ b/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewServiceDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.config.internal._Config;
/**
* @since 2.0.0-M2
*/
-@Singleton @ApplicationScoped
+@Singleton
public class ConfigurationViewServiceDefault implements ConfigurationViewService {
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index 70382ed..a740640 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
import org.apache.isis.core.metamodel.spec.InjectorMethodEvaluator;
-@Singleton @ApplicationScoped
+@Singleton
public class ServiceInjectorDefault implements ServiceInjector {
private static final Logger LOG = LoggerFactory.getLogger(ServiceInjectorDefault.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
index 71d5af7..3ae6240 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
@@ -18,13 +18,12 @@
*/
package org.apache.isis.core.metamodel.services.appfeat;
-import javax.inject.Singleton;
-import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
+import javax.inject.Singleton;
import org.apache.isis.applib.services.factory.FactoryService;
-@Singleton @ApplicationScoped
+@Singleton
public class ApplicationFeatureFactory {
public ApplicationFeature newApplicationFeature() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index c711d08..7a76d90 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -58,7 +58,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
import static org.apache.isis.config.internal._Config.getConfiguration;
-@Singleton @ApplicationScoped
+@Singleton
public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRepository {
// -- caches
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
index 25603d6..dc27d2d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -53,7 +53,7 @@ import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
* with {@link org.apache.isis.applib.annotation.DomainService}. Because this class is implemented in core, this means
* that it is automatically registered and available for use; no further configuration is required.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class BookmarkServiceInternalDefault implements BookmarkService, SerializingAdapter {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
index f48f7c7..a0df8f7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
-@Singleton @ApplicationScoped
+@Singleton
public class ExceptionRecognizerDocDefault
implements ExceptionRecognizer {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
index 396a56e..fb07823 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.services.persistsession.PersistenceSession
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-@Singleton @ApplicationScoped
+@Singleton
public class FactoryServiceInternalDefault implements FactoryService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index bf35902..0fbe969 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -46,7 +46,7 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.resources._Resources;
-@Singleton @ApplicationScoped
+@Singleton
public class GridLoaderServiceDefault implements GridLoaderService {
private static final Logger LOG = LoggerFactory.getLogger(GridLoaderServiceDefault.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
index 6381808..66de6c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
@@ -34,7 +34,7 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
-@Singleton @ApplicationScoped
+@Singleton
public class GridServiceDefault implements GridService {
//private static final Logger LOG = LoggerFactory.getLogger(GridServiceDefault.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index 7d6ee5c..be1f87e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -61,7 +61,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
-@Singleton @ApplicationScoped
+@Singleton
public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
public static final String TNS = "http://isis.apache.org/applib/layout/grid/bootstrap3";
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
index 068a4a6..3751d23 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-@Singleton @ApplicationScoped
+@Singleton
public class LayoutServiceDefault implements LayoutService2 {
//private static final Logger LOG = LoggerFactory.getLogger(LayoutServiceDefault.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 2193429..84c2749 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -56,7 +56,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
-@Singleton @ApplicationScoped
+@Singleton
public class MetaModelServiceDefault implements MetaModelService {
// private final static Logger LOG = LoggerFactory.getLogger(MetaModelServiceDefault.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
index cd5ebf4..40ae040 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -59,7 +59,7 @@ import lombok.extern.slf4j.Slf4j;
/**
* @since 2.0.0-M2
*/
-@Singleton @ApplicationScoped @Slf4j
+@Singleton @Slf4j
public final class ServiceRegistryDefault implements ServiceRegistry {
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
index e57021e..e1e1d85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
@@ -44,7 +44,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
-@Singleton @ApplicationScoped
+@Singleton
public class RepositoryServiceInternalDefault implements RepositoryService {
private boolean autoFlush;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
index 6ce8b53..8501f62 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
@@ -33,7 +33,7 @@ import static org.apache.isis.commons.internal.base._With.ifPresentElse;
import static org.apache.isis.commons.internal.resources._Resources.getRestfulPathIfAny;
import static org.apache.isis.commons.internal.resources._Resources.prependContextPathIfPresent;
-@Singleton @ApplicationScoped
+@Singleton
public class SwaggerServiceDefault implements SwaggerService {
// private final static Logger LOG = LoggerFactory.getLogger(SwaggerServiceDefault.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index a20f23b..0624a38 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
-@Singleton @ApplicationScoped
+@Singleton
public class TitleServiceDefault implements TitleService {
@Programmatic
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
index cf5fac5..c679a68 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSessionProvide
import static org.apache.isis.commons.internal.base._NullSafe.stream;
-@Singleton @ApplicationScoped
+@Singleton
public class UserServiceDefault implements UserService {
@Programmatic
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
index 254ebf1..38f1773 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
@@ -26,7 +26,7 @@ import javax.enterprise.context.ApplicationScoped;
import org.apache.isis.core.metamodel.spec.InjectorMethodEvaluator;
-@Singleton @ApplicationScoped
+@Singleton
public final class InjectorMethodEvaluatorDefault implements InjectorMethodEvaluator {
// private final Map<Method, Map<Class<?>, Boolean>> isInjectorMethod = _Maps.newConcurrentHashMap();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
index 9eb4808..b31557c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
import org.apache.isis.core.security.authorization.standard.Authorizor;
-@Singleton @ApplicationScoped
+@Singleton
public class AuthorizationManagerStandard implements AuthorizationManager {
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
index 7a2b6c3..a9c1466 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
@@ -61,7 +61,7 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
* with {@link org.apache.isis.applib.annotation.DomainService}. Because it is implemented in the core, this means
* that it is automatically registered and available for use; no further configuration is required.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class IsisJdoSupportDN4 implements IsisJdoSupport_v3_1 {
@Programmatic
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
index 244aabb..c2fce71 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
@@ -40,7 +40,7 @@ import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis.Hint;
* with {@link org.apache.isis.applib.annotation.DomainService}. Because it is implemented in the core, this means
* that it is automatically registered and available for use; no further configuration is required.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class EventBusServiceJdo extends EventBusServiceDefault {
/**
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
index fe282d3..b7780ea 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
@@ -60,7 +60,7 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
* with {@link org.apache.isis.applib.annotation.DomainService}. Because it is implemented in the core, this means
* that it is automatically registered and available for use; no further configuration is required.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
@Programmatic
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
index aa906a0..a9d9d9d 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
@@ -40,7 +40,7 @@ import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis.Hint;
* with {@link org.apache.isis.applib.annotation.DomainService}. Because it is implemented in the core, this means
* that it is automatically registered and available for use; no further configuration is required.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class EventBusServiceJdo extends EventBusServiceDefault {
/**
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
index db0bd5c..922c97c 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
@@ -66,7 +66,7 @@ import static org.apache.isis.config.internal._Config.getConfiguration;
* {@link SecurityManager Shiro SecurityManager}
* (bound to a thread-local).
*/
-@Singleton @ApplicationScoped
+@Singleton
public class ShiroAuthenticator implements Authenticator {
private static final Logger LOG = LoggerFactory.getLogger(ShiroAuthenticator.class);
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
index 5418a15..268ff15 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
@@ -40,7 +40,7 @@ import org.apache.isis.security.shiro.ShiroSecurityContext;
* However, although there are two objects, they are set up to share the same {@link SecurityManager Shiro SecurityManager}
* (bound to a thread-local).
*/
-@Singleton @ApplicationScoped
+@Singleton
public class ShiroAuthorizor implements Authorizor {
//private static final Logger LOG = LoggerFactory.getLogger(ShiroAuthorizor.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
index 1cd3254..a3649fb 100644
--- a/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -38,7 +38,7 @@ import org.apache.isis.config.internal._Config;
* the first one found).
* </p>
*/
-@Singleton @ApplicationScoped
+@Singleton
public class ExceptionRecognizerCompositeForJdoObjectStore extends ExceptionRecognizerComposite {
public static final String KEY_DISABLE =
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
index 68429a0..502aeaf 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.runtime.services.changes.PreAndPostValues;
/**
* Wrapper around {@link org.apache.isis.applib.services.audit.AuditerService}.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class AuditingServiceInternal {
Boolean whetherCanAudit;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
index 2638c43..ce25425 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
-@Singleton @ApplicationScoped
+@Singleton
public class AuthenticationSessionProviderDefault implements AuthenticationSessionProvider {
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index ab436f3..b641ca8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -54,7 +54,7 @@ import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
* {@link org.apache.isis.applib.services.background.BackgroundCommandService} to
* be configured.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class BackgroundServiceDefault implements BackgroundService {
static final Logger LOG = LoggerFactory.getLogger(BackgroundServiceDefault.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
index 2d14dc8..d9cb3f5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
@@ -73,7 +73,7 @@ import org.apache.isis.schema.common.v1.ValueWithTypeDto;
import org.apache.isis.schema.utils.CommandDtoUtils;
import org.apache.isis.schema.utils.CommonDtoUtils;
-@Singleton @ApplicationScoped
+@Singleton
public class CommandExecutorServiceDefault implements CommandExecutorService {
private final static Logger LOG = LoggerFactory.getLogger(CommandExecutorServiceDefault.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index efc4514..a3aa237 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -50,7 +50,7 @@ import org.apache.isis.schema.common.v1.ValueWithTypeDto;
import org.apache.isis.schema.utils.CommandDtoUtils;
import org.apache.isis.schema.utils.CommonDtoUtils;
-@Singleton @ApplicationScoped
+@Singleton
public class CommandDtoServiceInternalDefault implements CommandDtoServiceInternal {
@Programmatic
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
index 1e1d1e7..23ff14d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandDefault;
import org.apache.isis.applib.services.command.spi.CommandService;
-@Singleton @ApplicationScoped
+@Singleton
public class CommandServiceDefault implements CommandService {
@Programmatic
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
index 5dfcf7d..0905500 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
@@ -43,7 +43,7 @@ import org.apache.isis.config.IsisConfiguration;
/**
* A service that sends email notifications when specific events occur
*/
-@Singleton @ApplicationScoped
+@Singleton
public class EmailServiceDefault implements EmailService {
private static final long serialVersionUID = 1L;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
index 417ba99..b70db8f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-@Singleton @ApplicationScoped
+@Singleton
public class HomePageProviderServiceDefault implements HomePageProviderService {
//private final static Logger LOG = LoggerFactory.getLogger(HomePageProviderServiceDefault.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index 64c8cae..d73713a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -34,7 +34,7 @@ import org.apache.isis.commons.internal.context._Context;
import static org.apache.isis.config.internal._Config.getConfiguration;
-@Singleton @ApplicationScoped
+@Singleton
public class TranslationServicePo implements TranslationService {
public static Logger LOG = LoggerFactory.getLogger(TranslationServicePo.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
index dbc60f8..2af1398 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
@@ -45,7 +45,7 @@ import org.apache.isis.schema.ixn.v1.PropertyEditDto;
import org.apache.isis.schema.utils.CommandDtoUtils;
import org.apache.isis.schema.utils.InteractionDtoUtils;
-@Singleton @ApplicationScoped
+@Singleton
public class InteractionDtoServiceInternalDefault implements InteractionDtoServiceInternal {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
index 2d03295..ba8113f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import static org.apache.isis.commons.internal.resources._Resources.loadAsString;
-@Singleton @ApplicationScoped
+@Singleton
public class MenuBarsLoaderServiceDefault implements MenuBarsLoaderService {
private final static Logger log = LoggerFactory.getLogger(MenuBarsLoaderServiceDefault.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
index 4ed71cf..e2ab966 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -64,7 +64,7 @@ import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-@Singleton @ApplicationScoped
+@Singleton
public class MenuBarsServiceBS3 implements MenuBarsService {
private static final Logger LOG = LoggerFactory.getLogger(MenuBarsServiceBS3.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
index ee65eda..807568d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.security.authentication.MessageBroker;
-@Singleton @ApplicationScoped
+@Singleton
public class MessageServiceDefault implements MessageService {
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index 25c0b76..8d1e8ad 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -54,7 +54,7 @@ import static java.util.Optional.ofNullable;
import static org.apache.isis.commons.internal.base._With.acceptIfPresent;
import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-@Singleton @ApplicationScoped
+@Singleton
public class PersistenceSessionServiceInternalDefault implements PersistenceSessionServiceInternal {
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index 64c3d05..2717870 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.services.persistsession.PersistenceSession
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-@Singleton @ApplicationScoped
+@Singleton
public class SessionManagementServiceDefault implements SessionManagementService {
@Programmatic
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
index f5112cd..3c8e2e2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
@@ -30,7 +30,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.sudo.SudoService;
-@Singleton @ApplicationScoped
+@Singleton
public class SudoServiceDefault implements SudoService {
@Programmatic
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userprof/UserProfileServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userprof/UserProfileServiceDefault.java
index 07784b0..3ee863c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userprof/UserProfileServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userprof/UserProfileServiceDefault.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.userprof.UserProfileService;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-@Singleton @ApplicationScoped
+@Singleton
public class UserProfileServiceDefault implements UserProfileService {
@Programmatic
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
index 10c9af3..e467bac 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
@@ -44,7 +44,7 @@ import static java.util.regex.Pattern.quote;
/**
* A service that sends email notifications when specific events occur
*/
-@Singleton @ApplicationScoped
+@Singleton
public class EmailNotificationServiceDefault implements EmailNotificationService {
private static final long serialVersionUID = 1L;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xactn/TransactionServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xactn/TransactionServiceDefault.java
index c19169f..b3b2a2e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xactn/TransactionServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xactn/TransactionServiceDefault.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
-@Singleton @ApplicationScoped
+@Singleton
public class TransactionServiceDefault implements TransactionService {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
index 0b9c120..23c2446 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
* with {@link org.apache.isis.applib.annotation.DomainService}. Because this class is implemented in core, this means
* that it is automatically registered and available for use; no further configuration is required.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
static class XmlSnapshotServiceDefaultBuilder implements XmlSnapshotService.Builder{
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
index 18c8692..b0fff7c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
@@ -68,7 +68,7 @@ import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
* it can be {@link Inject}'d into other domain services.
* </p>
*/
-@Singleton @ApplicationScoped
+@Singleton
public class IsisSessionFactoryDefault implements IsisSessionFactory {
//private final static Logger LOG = LoggerFactory.getLogger(IsisSessionFactory.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index 05e2d07..1bccbd6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -68,7 +68,7 @@ import org.apache.isis.core.wrapper.proxy.ProxyCreator;
* <p>
* This implementation has no UI-visible actions and is the supported implementation.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class WrapperFactoryDefault implements WrapperFactory {
private final List<InteractionListener> listeners = new ArrayList<InteractionListener>();
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
index 5cb1678..ddc3534 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
@@ -38,7 +38,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndPr
import org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationService;
import org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceForRestfulObjectsV1_0;
-@Singleton @ApplicationScoped
+@Singleton
public class RepresentationServiceContentNegotiator implements RepresentationService {
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
index d3c1fdd..bf2f33d 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
@@ -46,7 +46,7 @@ import images.Images;
* <p>
* Searches for a fixed set of suffixes: <code>png, gif, jpeg, jpg, svg</code>.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class ImageResourceCacheClassPath implements ImageResourceCache {
private static final long serialVersionUID = 1L;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index 5cade62..8748643 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -94,7 +94,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.entitysimplelink.Enti
* implementations loaded using {@link ServiceLoader} (ie from
* <tt>META-INF/services</tt>).
*/
-@Singleton @ApplicationScoped
+@Singleton
public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistrar {
@Override
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index a1bfed7..deebcb7 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -47,7 +47,7 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
* Implementation of {@link ComponentFactoryRegistry} that delegates to a
* provided {@link ComponentFactoryRegistrar}.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class ComponentFactoryRegistryDefault implements ComponentFactoryRegistry {
private final Multimap<ComponentType, ComponentFactory> componentFactoriesByType;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index 32f8ff6..9f52fbd 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -43,7 +43,7 @@ import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
* Default implementation of {@link PageClassList}, specifying the default pages
* for each of the {@link PageType}s.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class PageClassListDefault implements PageClassList {
private static final long serialVersionUID = 1L;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
index 181e214..5282736 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistrySpi;
* Default implementation of {@link PageClassRegistry}; just delegates to an
* underlying {@link PageClassList}.
*/
-@Singleton @ApplicationScoped
+@Singleton
public class PageClassRegistryDefault implements PageClassRegistry, PageClassRegistrySpi {
private static final long serialVersionUID = 1L;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
index 996acbf..fc451ae 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
/**
* Default implementation of {@link org.apache.isis.viewer.wicket.ui.pages.PageNavigationService}
*/
-@Singleton @ApplicationScoped
+@Singleton
public class PageNavigationServiceDefault implements PageNavigationService {
private static final long serialVersionUID = 1L;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index bc84db6..ee141de 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -43,7 +43,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
* An implementation of {@link org.apache.isis.applib.services.linking.DeepLinkService}
* for Wicket Viewer
*/
-@Singleton @ApplicationScoped
+@Singleton
public class DeepLinkServiceWicket implements DeepLinkService {
@Programmatic
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java
index d0fd4f4..e3e4f01 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.core.runtime.system.context.IsisContext;
-@Singleton @ApplicationScoped
+@Singleton
public class EmailNotificationServiceWicket implements EmailNotificationService {
private static final long serialVersionUID = 1L;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index f536f16..a5aa504 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
-@Singleton @ApplicationScoped
+@Singleton
public class WicketViewerSettingsDefault implements WicketViewerSettings {
private static final long serialVersionUID = 1L;