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 2018/12/18 17:04:52 UTC

[isis] branch v2 updated (8920b67 -> f8812eb)

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 8920b67  ISIS-2040: Add stub classes for new module 'security-pac4j'.
     new 57fd702  ISIS-2040: split ShiroAuthenticatorOrAuthorizor into 2 classes
     new f8812eb  ISIS-2033: Major (interim): thrown away Installers and Guice

The 2 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:
 .../java/org/apache/isis/applib/AppManifest.java   |  23 ++-
 .../conmap/ContentMappingServiceForCommandDto.java |   9 +-
 .../isis/applib/fixturescripts/FixtureScript.java  |  35 +---
 .../isis/applib/fixturescripts/FixtureScripts.java |  36 +---
 .../services/confview/ConfigurationMenu.java       |   5 +-
 .../fixturespec/FixtureScriptsDefault.java         |  18 +-
 .../isis/applib/services/jaxb/JaxbService.java     |   3 +-
 .../applib/services/jaxb/JaxbServiceDefault.java   |  16 +-
 .../applib/services/layout/LayoutServiceMenu.java  |   4 +-
 .../services/metamodel/MetaModelServicesMenu.java  |   3 +-
 .../services/routing/RoutingServiceDefault.java    |  17 +-
 .../services/swagger/SwaggerServiceMenu.java       |   5 +-
 .../bootstrap3/BS3MenuBars_roundtrip_Test.java     |   2 +-
 core/commons/pom.xml                               |   8 +
 .../org/apache/isis/commons/internal/cdi/_CDI.java |  27 ++-
 .../commons/internal/exceptions/_Exceptions.java   |   6 +
 .../components/ApplicationScopedComponent.java     |  36 ----
 .../isis/core/commons/components/Installer.java    |  48 -----
 .../core/commons/components/InstallerAbstract.java |  97 ---------
 .../isis/core/plugins/eventbus/EventBusPlugin.java |   2 +-
 .../apache/isis/core/plugins/ioc/IocPlugin.java}   |  27 ++-
 .../org/apache/isis/config/AppConfigLocator.java   |   8 +-
 .../org/apache/isis/config/AppManifestFinder.java  |  83 --------
 .../org/apache/isis/config/IsisConfiguration.java  |   6 +
 .../apache/isis/config/beans/WebAppConfigBean.java |  20 ++
 .../config/builder/IsisConfigurationDefault.java   |  17 +-
 .../view/ConfigurationViewServiceDefault.java      |   9 +-
 core/mavendeps/webapp/pom.xml                      |   5 +
 .../core/metamodel/services/ServicesInjector.java  |   3 +-
 .../appfeat/ApplicationFeatureFactory.java         |   9 +-
 .../ApplicationFeatureRepositoryDefault.java       |  11 +-
 .../services/appmanifest/AppManifestProvider.java  |   1 +
 .../bookmarks/BookmarkServiceInternalDefault.java  |   8 +-
 .../exceprecog/ExceptionRecognizerDocDefault.java  |   8 +-
 .../factory/FactoryServiceInternalDefault.java     |  21 +-
 .../services/grid/GridLoaderServiceDefault.java    |  23 +--
 .../services/grid/GridServiceDefault.java          |  36 ++--
 .../services/grid/GridSystemServiceAbstract.java   |  17 +-
 .../grid/bootstrap3/GridSystemServiceBS3.java      |  13 +-
 .../services/layout/LayoutServiceDefault.java      |  25 +--
 .../services/message/MessageServiceNoop.java       |   8 +-
 .../metamodel/MetaModelServiceDefault.java         |  44 ++--
 .../PersistenceSessionServiceInternalNoop.java     |   8 +-
 .../services/registry/ServiceRegistryDefault.java  |  18 +-
 .../RepositoryServiceInternalDefault.java          |   8 +-
 .../services/swagger/SwaggerServiceDefault.java    |  18 +-
 .../services/title/TitleServiceDefault.java        |  17 +-
 .../services/user/UserServiceDefault.java          | 202 +++++++++---------
 .../metamodel/specloader/SpecificationLoader.java  |   6 +-
 .../specloader/validator/MetaModelValidator.java   |   3 +-
 .../core/metamodel/services/grid/BS3GridTest.java  |  15 +-
 .../services/menubars/BS3MenuBarsTest.java         |   2 +-
 core/plugins/{security-pac4j => ioc-weld}/pom.xml  |  47 +----
 .../core/plugins/ioc/weld/IocPluginUsingWeld.java} |  24 ++-
 .../isis/core/plugins/ioc/weld/WeldFactory.java    | 115 +++++++++++
 .../org.apache.isis.core.plugins.ioc.IocPlugin     |   1 +
 .../services/jdosupport/IsisJdoSupportDN4.java     |  12 +-
 .../DataNucleusApplicationComponents4.java         |   7 +-
 .../persistence/PersistenceSessionFactory4.java    |   3 +-
 .../service/eventbus/EventBusServiceJdo.java       |   9 +-
 .../services/jdosupport/IsisJdoSupportDN5.java     |  12 +-
 .../DataNucleusApplicationComponents5.java         |   3 +-
 .../persistence/PersistenceSessionFactory5.java    |   3 +-
 .../service/eventbus/EventBusServiceJdo.java       |   9 +-
 .../pac4j/authentication/Pac4jAuthenticator.java   |  12 +-
 .../Pac4jAuthorizationManagerInstaller.java        |  37 ----
 .../apache/isis/security/shiro/ShiroConstants.java |  34 ----
 .../isis/security/shiro/ShiroSecurityContext.java  |  51 +++++
 .../ShiroAuthenticationManagerInstaller.java       |  41 ----
 .../ShiroAuthenticator.java}                       | 106 ++--------
 .../ShiroAuthorizationManagerInstaller.java        |  38 ----
 .../shiro/authorization/ShiroAuthorizor.java       | 128 ++++++++++++
 ...AuthenticatorOrAuthorizorTest_authenticate.java |  28 ++-
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |  29 ++-
 core/pom.xml                                       |  25 +--
 ...eptionRecognizerCompositeForJdoObjectStore.java |  11 +-
 .../apache/isis/core/runtime/RuntimeModule.java    |   5 +
 .../PersistenceMechanismInstaller.java             |  32 ---
 .../runtime/runner/opts/OptionHandlerPassword.java |  66 ------
 .../runtime/runner/opts/OptionHandlerUser.java     |  67 ------
 .../core/runtime/services/ServicesInstaller.java   |  38 ----
 .../services/ServicesInstallerAbstract.java        |  30 ---
 .../services/ServicesInstallerFromAnnotation.java  | 139 -------------
 .../ServicesInstallerFromConfiguration.java        | 122 -----------
 ...cesInstallerFromConfigurationAndAnnotation.java |  96 ---------
 .../runtime/services/ServicesInstallerUtils.java   |  97 ---------
 .../services/auditing/AuditingServiceInternal.java |  36 ++--
 .../AuthenticationSessionProviderDefault.java      |  35 ++--
 .../background/BackgroundServiceDefault.java       |  44 ++--
 .../background/CommandExecutorServiceDefault.java  |  30 +--
 .../changes/ChangedObjectsServiceInternal.java     |   6 -
 .../command/CommandDtoServiceInternalDefault.java  |   8 +-
 .../services/command/CommandServiceDefault.java    |   9 +-
 .../services/email/EmailServiceDefault.java        |  12 +-
 .../homepage/HomePageProviderServiceDefault.java   |   9 +-
 .../services/i18n/po/TranslationServicePo.java     |   8 +-
 .../ixn/InteractionDtoServiceInternalDefault.java  |   9 +-
 .../menubars/MenuBarsLoaderServiceDefault.java     |   6 +-
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    |   4 +-
 .../services/message/MessageServiceDefault.java    |   9 +-
 .../services/metrics/MetricsServiceDefault.java    |   6 -
 .../PersistenceSessionServiceInternalDefault.java  |  19 +-
 .../publish/PublishingServiceInternalDefault.java  |  40 +---
 .../sessmgmt/SessionManagementServiceDefault.java  |  10 +-
 .../runtime/services/sudo/SudoServiceDefault.java  |  16 +-
 .../userprof/UserProfileServiceDefault.java        |   8 +-
 .../userreg/EmailNotificationServiceDefault.java   |  18 +-
 .../services/xactn/TransactionServiceDefault.java  |   9 +-
 .../xmlsnapshot/XmlSnapshotServiceDefault.java     |   9 +-
 .../isis/core/runtime/system/SystemConstants.java  |  39 ----
 .../runtime/system/session}/IsisInjectModule.java  |  55 ++---
 .../runtime/system/session/IsisSessionFactory.java |   8 +-
 .../system/session/IsisSessionFactoryBuilder.java  |   4 -
 .../IsisComponentProvider.java                     |  20 --
 ...sisComponentProviderHelper_UsingInstallers.java | 226 ---------------------
 .../isis/core/wrapper/WrapperFactoryDefault.java   |  17 +-
 .../service/support/TimestampService.java          |   6 -
 .../BypassAuthenticationManagerInstaller.java      |  47 -----
 .../manager/AuthenticationManager.java             |   3 +-
 .../manager/AuthenticationManagerInstaller.java    |  30 ---
 ...gerStandardInstallerAbstractForDfltRuntime.java |  56 -----
 ...enticationManagerStandardInstallerAbstract.java |  59 ------
 .../authentication/standard/Authenticator.java     |   3 +-
 .../authentication/standard/Registrar.java         |   3 +-
 .../BypassAuthorizationManagerInstaller.java       |  36 ----
 .../manager/AuthorizationManager.java              |   3 +-
 .../manager/AuthorizationManagerInstaller.java     |  30 ---
 ...horizationManagerStandardInstallerAbstract.java |  98 ---------
 .../authorization/standard/Authorizor.java         |   3 +-
 .../core/security/authspi/SecurityAuthPlugin.java} |  39 ++--
 .../RepresentationServiceContentNegotiator.java    |  18 +-
 .../ContentNegotiationServiceXRoDomainType.java    |   6 +-
 core/viewer-wicket-impl/pom.xml                    |  12 +-
 .../wicket/viewer/IsisWicketApplication.java       |  92 ++++-----
 .../viewer/wicket/viewer/IsisWicketModule.java     | 144 +++++--------
 .../imagecache/ImageResourceCacheClassPath.java    |   3 +-
 .../ComponentFactoryRegistrarDefault.java          |   7 +-
 .../ComponentFactoryRegistryDefault.java           |   5 +-
 .../registries/pages/PageClassListDefault.java     |   8 +-
 .../registries/pages/PageClassRegistryDefault.java |  18 +-
 .../pages/PageNavigationServiceDefault.java        |  11 +-
 .../viewer/services/DeepLinkServiceWicket.java     |  22 +-
 .../services/EmailNotificationServiceWicket.java   |   4 +-
 .../wicket/viewer/services/EmailServiceWicket.java |  55 -----
 .../viewer/services/GuiceBeanProviderWicket.java   |  56 -----
 .../settings/WicketViewerSettingsDefault.java      |   2 +-
 .../isisWicketModule_bindingsStandard_Test.java    | 155 ++++++--------
 ...ageClassListDefault_RegistrationAndCaching.java |   5 +-
 .../pages/PageClassListDefault_Instantiation.java  |  17 +-
 core/viewer-wicket-ui/pom.xml                      |  11 -
 .../wicket/ui/components/about/AboutPanel.java     |  26 +--
 .../serviceactions/TertiaryActionsPanel.java       |  11 +-
 .../bookmarkedpages/BookmarkedPagesPanel.java      |   6 +-
 .../entity/icontitle/EntityIconAndTitlePanel.java  |   8 +-
 .../wicket/ui/components/footer/CreditName.java    |   1 +
 .../wicket/ui/components/footer/FooterPanel.java   |  15 +-
 .../scalars/ScalarPanelTextFieldAbstract.java      |   4 +-
 .../ScalarPanelTextFieldDatePickerAbstract.java    |   4 +-
 .../scalars/reference/ReferencePanel.java          |   4 +-
 .../valuechoices/ValueChoicesSelect2Panel.java     |   4 +-
 .../wicket/ui/components/welcome/WelcomePanel.java |  12 +-
 .../ui/components/widgets/favicon/Favicon.java     |  22 +-
 .../ui/components/widgets/navbar/BrandLogo.java    |  18 +-
 .../ui/components/widgets/navbar/BrandName.java    |  25 +--
 .../wicket/ui/errors/ExceptionStackTracePanel.java |  25 ++-
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |  41 +---
 .../accmngt/AccountManagementPageAbstract.java     |  27 +--
 .../password_reset/PasswordResetEmailPanel.java    |  33 +--
 .../pages/accmngt/signup/RegistrationFormPage.java |   5 +-
 .../accmngt/signup/RegistrationFormPanel.java      |  31 +--
 .../wicket/ui/pages/login/IsisSignInPanel.html     |  40 +++-
 .../wicket/ui/pages/login/IsisSignInPanel.java     |  16 +-
 .../wicket/ui/pages/login/WicketLogoutPage.java    |   8 +-
 .../wicket/ui/pages/login/WicketSignInPage.css     |   4 +
 .../wicket/ui/pages/login/WicketSignInPage.html    |  17 +-
 .../ui/pages/login/WicketSignInPage.properties     |   1 +
 .../wicket/ui/pages/mmverror/MmvErrorPage.java     |  40 ++--
 .../viewer/wicket/ui/panels/PanelAbstract.java     |   6 +-
 .../wicket/ui/panels/PromptFormPanelAbstract.java  |   9 +-
 example/application/helloworld/pom.xml             |   6 +
 .../application/HelloWorldAppManifest.java         |   8 +-
 .../java/domainapp/dom/impl/HelloWorldObjects.java |   8 +-
 182 files changed, 1486 insertions(+), 3371 deletions(-)
 delete mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java
 delete mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
 copy core/{viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/UriBuilderPlugin.java => commons/src/main/java/org/apache/isis/core/plugins/ioc/IocPlugin.java} (66%)
 delete mode 100644 core/config/src/main/java/org/apache/isis/config/AppManifestFinder.java
 create mode 100644 core/config/src/main/java/org/apache/isis/config/beans/WebAppConfigBean.java
 copy core/plugins/{security-pac4j => ioc-weld}/pom.xml (65%)
 copy core/{applib/src/test/java/org/apache/isis/applib/util/NumberedEvaluator.java => plugins/ioc-weld/src/main/java/org/apache/isis/core/plugins/ioc/weld/IocPluginUsingWeld.java} (65%)
 create mode 100644 core/plugins/ioc-weld/src/main/java/org/apache/isis/core/plugins/ioc/weld/WeldFactory.java
 create mode 100644 core/plugins/ioc-weld/src/main/resources/META-INF/services/org.apache.isis.core.plugins.ioc.IocPlugin
 delete mode 100644 core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authorization/Pac4jAuthorizationManagerInstaller.java
 delete mode 100644 core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroConstants.java
 create mode 100644 core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
 delete mode 100644 core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java
 rename core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/{ShiroAuthenticatorOrAuthorizor.java => authentication/ShiroAuthenticator.java} (73%)
 delete mode 100644 core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizationManagerInstaller.java
 create mode 100644 core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
 create mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeModule.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
 rename core/{viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis => runtime/src/main/java/org/apache/isis/core/runtime/system/session}/IsisInjectModule.java (63%)
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderHelper_UsingInstallers.java
 delete mode 100644 core/security/src/main/java/org/apache/isis/core/security/authentication/bypass/BypassAuthenticationManagerInstaller.java
 delete mode 100644 core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManagerInstaller.java
 delete mode 100644 core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
 delete mode 100644 core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
 delete mode 100644 core/security/src/main/java/org/apache/isis/core/security/authorization/bypass/BypassAuthorizationManagerInstaller.java
 delete mode 100644 core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManagerInstaller.java
 delete mode 100644 core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
 rename core/{plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authentication/Pac4jAuthenticationManagerInstaller.java => security/src/main/java/org/apache/isis/core/security/authspi/SecurityAuthPlugin.java} (59%)
 delete mode 100644 core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailServiceWicket.java
 delete mode 100644 core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java
 rename core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/{ => registries}/pages/PageClassListDefault_Instantiation.java (80%)


[isis] 01/02: ISIS-2040: split ShiroAuthenticatorOrAuthorizor into 2 classes

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 57fd702ef814c87490ee139f75c579ac058fff93
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Dec 17 23:05:45 2018 +0100

    ISIS-2040: split ShiroAuthenticatorOrAuthorizor into 2 classes
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2040
---
 .../isis/security/shiro/ShiroSecurityContext.java  |  51 +++++++++
 .../ShiroAuthenticationManagerInstaller.java       |   3 +-
 .../ShiroAuthenticator.java}                       | 101 ++--------------
 .../ShiroAuthorizationManagerInstaller.java        |   3 +-
 .../shiro/authorization/ShiroAuthorizor.java       | 127 +++++++++++++++++++++
 ...AuthenticatorOrAuthorizorTest_authenticate.java |  28 +++--
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |  29 +++--
 .../runtime/services/ServicesInstallerUtils.java   |   5 +-
 .../core/security/authspi/SecurityAuthPlugin.java} |  40 ++++---
 9 files changed, 251 insertions(+), 136 deletions(-)

diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
new file mode 100644
index 0000000..7cbb9ad
--- /dev/null
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.security.shiro;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
+import org.apache.shiro.mgt.RealmSecurityManager;
+import org.apache.shiro.mgt.SecurityManager;
+
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
+
+/**
+ * @since 2.0.0-M2
+ */
+public final class ShiroSecurityContext {
+
+    /**
+     * The {@link SecurityManager} is shared between both the {@link Authenticator} and the {@link Authorizor}
+     * (if shiro is configured for both components).
+     */
+    public static RealmSecurityManager getSecurityManager() {
+        SecurityManager securityManager;
+        try {
+            securityManager = SecurityUtils.getSecurityManager();
+        } catch(UnavailableSecurityManagerException ex) {
+            return null;
+        }
+        if(!(securityManager instanceof RealmSecurityManager)) {
+            return null;
+        }
+        return (RealmSecurityManager) securityManager;
+    }
+    
+}
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java
index 90f1053..7776af9 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java
@@ -23,7 +23,6 @@ import java.util.List;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.core.security.authentication.manager.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
 import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.security.shiro.ShiroAuthenticatorOrAuthorizor;
 
 public class ShiroAuthenticationManagerInstaller
 extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
@@ -36,6 +35,6 @@ extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
 
     @Override
     protected List<Authenticator> createAuthenticators() {
-        return _Lists.singleton(new ShiroAuthenticatorOrAuthorizor());
+        return _Lists.singleton(new ShiroAuthenticator());
     }
 }
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
similarity index 74%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
rename to core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
index d62391e..30042c0 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.security.shiro;
+package org.apache.isis.security.shiro.authentication;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -24,7 +24,6 @@ import java.util.Set;
 import java.util.stream.Stream;
 
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.UnavailableSecurityManagerException;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -43,7 +42,6 @@ import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.isis.applib.Identifier;
 import org.apache.isis.commons.internal.collections._Sets;
 import org.apache.isis.core.security.authentication.AuthenticationRequest;
 import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
@@ -53,22 +51,23 @@ import org.apache.isis.core.security.authentication.standard.Authenticator;
 import org.apache.isis.core.security.authentication.standard.SimpleSession;
 import org.apache.isis.core.security.authorization.manager.AuthorizationManagerInstaller;
 import org.apache.isis.core.security.authorization.standard.Authorizor;
-import org.apache.isis.security.shiro.authorization.IsisPermission;
+import org.apache.isis.security.shiro.ShiroSecurityContext;
 
 import static org.apache.isis.config.internal._Config.getConfiguration;
 
 /**
  * If Shiro is configured for both {@link AuthenticationManagerInstaller authentication} and
  * {@link AuthorizationManagerInstaller authorization} (as recommended), then this class is
- * instantiated twice, once in the role of {@link Authenticator} and once in the role of the {@link Authorizor}.
+ * in the role of {@link Authenticator}.
  *
  * <p>
- * However, although there are two objects, they are set up to share the same {@link SecurityManager Shiro SecurityManager}
+ * However, although there are two objects, they are set up to share the same 
+ * {@link SecurityManager Shiro SecurityManager}
  * (bound to a thread-local).
  */
-public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor {
+public class ShiroAuthenticator implements Authenticator {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ShiroAuthenticatorOrAuthorizor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ShiroAuthenticator.class);
 
     private static final String ISIS_AUTHENTICATION_SHIRO_AUTO_LOGOUT_KEY = "isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated";
     private static final boolean ISIS_AUTHENTICATION_SHIRO_AUTO_LOGOUT_DEFAULT = false;
@@ -76,7 +75,7 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
     // -- constructor and fields
     private final boolean autoLogout;
 
-    public ShiroAuthenticatorOrAuthorizor() {
+    public ShiroAuthenticator() {
         autoLogout = getConfiguration().getBoolean(
                 ISIS_AUTHENTICATION_SHIRO_AUTO_LOGOUT_KEY,
                 ISIS_AUTHENTICATION_SHIRO_AUTO_LOGOUT_DEFAULT);
@@ -223,93 +222,13 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
         return new UsernamePasswordToken(username, password);
     }
 
-
-    // -- Authorizor API
-
-    @Override
-    public boolean isVisibleInAnyRole(Identifier identifier) {
-        return isPermitted(identifier, "r");
-    }
-
-    @Override
-    public boolean isUsableInAnyRole(Identifier identifier) {
-        return isPermitted(identifier, "w");
-    }
-
-    private boolean isPermitted(Identifier identifier, String qualifier) {
-        
-        RealmSecurityManager securityManager = getSecurityManager();
-        if(securityManager == null) {
-            // since a security manager will always be present for regular web requests, presumably the user
-            // is running in fixtures during bootstrapping.  We therefore permit the interaction.
-            return true;
-        }
-
-        String permission = asPermissionsString(identifier) + ":" + qualifier;
-
-        Subject subject = SecurityUtils.getSubject();
-
-        try {
-            return subject.isPermitted(permission);
-        } finally {
-            IsisPermission.resetVetoedPermissions();
-        }
-    }
-
-    private static String asPermissionsString(Identifier identifier) {
-        String fullyQualifiedClassName = identifier.getClassName();
-        int lastDot = fullyQualifiedClassName.lastIndexOf('.');
-        String packageName;
-        String className;
-        if(lastDot > 0) {
-            packageName =fullyQualifiedClassName.substring(0, lastDot);
-            className = fullyQualifiedClassName.substring(lastDot+1);
-        } else {
-            packageName = "";
-            className = fullyQualifiedClassName;
-        }
-        return packageName + ":" + className + ":" + identifier.getMemberName();
-    }
-
-    /**
-     * Returns <tt>false</tt> because the checking across all roles is done in
-     * {@link #isVisibleInAnyRole(Identifier)}, which is always called prior to this.
-     */
-    @Override
-    public boolean isVisibleInRole(String role, Identifier identifier) {
-        return false;
-    }
-
-    /**
-     * Returns <tt>false</tt> because the checking across all roles is done in
-     * {@link #isUsableInAnyRole(Identifier)}, which is always called prior to this.
-     */
-    @Override
-    public boolean isUsableInRole(String role, Identifier identifier) {
-        return false;
-    }
-
-
-
-    // -- Injected (via Shiro service locator)
-
     /**
      * The {@link SecurityManager} is shared between both the {@link Authenticator} and the {@link Authorizor}
      * (if shiro is configured for both components).
      */
     protected RealmSecurityManager getSecurityManager() {
-        SecurityManager securityManager;
-        try {
-            securityManager = SecurityUtils.getSecurityManager();
-        } catch(UnavailableSecurityManagerException ex) {
-            return null;
-        }
-        if(!(securityManager instanceof RealmSecurityManager)) {
-            return null;
-        }
-        return (RealmSecurityManager) securityManager;
+        return ShiroSecurityContext.getSecurityManager();
     }
-
-
+    
 
 }
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizationManagerInstaller.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizationManagerInstaller.java
index b26c87f..2a12449 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizationManagerInstaller.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizationManagerInstaller.java
@@ -20,7 +20,6 @@ package org.apache.isis.security.shiro.authorization;
 
 import org.apache.isis.core.security.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
 import org.apache.isis.core.security.authorization.standard.Authorizor;
-import org.apache.isis.security.shiro.ShiroAuthenticatorOrAuthorizor;
 
 public class ShiroAuthorizationManagerInstaller extends AuthorizationManagerStandardInstallerAbstract {
 
@@ -32,7 +31,7 @@ public class ShiroAuthorizationManagerInstaller extends AuthorizationManagerStan
 
     @Override
     protected Authorizor createAuthorizor() {
-        return new ShiroAuthenticatorOrAuthorizor();
+        return new ShiroAuthorizor();
     }
 
 }
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
new file mode 100644
index 0000000..783df9c
--- /dev/null
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
@@ -0,0 +1,127 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.security.shiro.authorization;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.mgt.RealmSecurityManager;
+import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.subject.Subject;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManagerInstaller;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authorization.manager.AuthorizationManagerInstaller;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
+import org.apache.isis.security.shiro.ShiroSecurityContext;
+
+/**
+ * If Shiro is configured for both {@link AuthenticationManagerInstaller authentication} and
+ * {@link AuthorizationManagerInstaller authorization} (as recommended), then this class is
+ * instantiated twice in the role of the {@link Authorizor}.
+ *
+ * <p>
+ * However, although there are two objects, they are set up to share the same {@link SecurityManager Shiro SecurityManager}
+ * (bound to a thread-local).
+ */
+public class ShiroAuthorizor implements Authorizor {
+
+    //private static final Logger LOG = LoggerFactory.getLogger(ShiroAuthorizor.class);
+
+    @Override
+    public void init() {
+    }
+
+
+    @Override
+    public void shutdown() {
+    }
+
+   
+    @Override
+    public boolean isVisibleInAnyRole(Identifier identifier) {
+        return isPermitted(identifier, "r");
+    }
+
+    @Override
+    public boolean isUsableInAnyRole(Identifier identifier) {
+        return isPermitted(identifier, "w");
+    }
+
+    private boolean isPermitted(Identifier identifier, String qualifier) {
+        
+        RealmSecurityManager securityManager = getSecurityManager();
+        if(securityManager == null) {
+            // since a security manager will always be present for regular web requests, presumably the user
+            // is running in fixtures during bootstrapping.  We therefore permit the interaction.
+            return true;
+        }
+
+        String permission = asPermissionsString(identifier) + ":" + qualifier;
+
+        Subject subject = SecurityUtils.getSubject();
+
+        try {
+            return subject.isPermitted(permission);
+        } finally {
+            IsisPermission.resetVetoedPermissions();
+        }
+    }
+
+    private static String asPermissionsString(Identifier identifier) {
+        String fullyQualifiedClassName = identifier.getClassName();
+        int lastDot = fullyQualifiedClassName.lastIndexOf('.');
+        String packageName;
+        String className;
+        if(lastDot > 0) {
+            packageName =fullyQualifiedClassName.substring(0, lastDot);
+            className = fullyQualifiedClassName.substring(lastDot+1);
+        } else {
+            packageName = "";
+            className = fullyQualifiedClassName;
+        }
+        return packageName + ":" + className + ":" + identifier.getMemberName();
+    }
+
+    /**
+     * Returns <tt>false</tt> because the checking across all roles is done in
+     * {@link #isVisibleInAnyRole(Identifier)}, which is always called prior to this.
+     */
+    @Override
+    public boolean isVisibleInRole(String role, Identifier identifier) {
+        return false;
+    }
+
+    /**
+     * Returns <tt>false</tt> because the checking across all roles is done in
+     * {@link #isUsableInAnyRole(Identifier)}, which is always called prior to this.
+     */
+    @Override
+    public boolean isUsableInRole(String role, Identifier identifier) {
+        return false;
+    }
+
+    /**
+     * The {@link SecurityManager} is shared between both the {@link Authenticator} and the {@link Authorizor}
+     * (if shiro is configured for both components).
+     */
+    protected RealmSecurityManager getSecurityManager() {
+        return ShiroSecurityContext.getSecurityManager();
+    }
+
+}
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 7394fee..87e1f52 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -36,6 +36,8 @@ import org.apache.isis.core.security.authentication.AuthenticationRequestPasswor
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.shiro.authentication.ShiroAuthenticator;
+import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -47,7 +49,8 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
     @Rule
     public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
 
-    private ShiroAuthenticatorOrAuthorizor authOrAuth;
+    private ShiroAuthenticator authenticator;
+    private ShiroAuthorizor authorizor;
 
     @Before
     public void setUp() throws Exception {
@@ -57,8 +60,11 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
         _Config.clear();
         _Config.put("isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated", false);
     	
-   		authOrAuth = new ShiroAuthenticatorOrAuthorizor();
-    	authOrAuth.init();
+        authenticator = new ShiroAuthenticator();
+        authorizor = new ShiroAuthorizor();
+        
+        authenticator.init();
+        authorizor.init();
     }
 
     @After
@@ -73,8 +79,8 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
     @Test
     public void cannotAuthenticateIfShiroEnvironmentNotInitialized() throws Exception {
 
-        assertThat(authOrAuth.canAuthenticate(AuthenticationRequestPassword.class), is(false));
-        assertThat(authOrAuth.authenticate(new AuthenticationRequestPassword("dummy", "dummy"), "unused"), is(nullValue()));
+        assertThat(authenticator.canAuthenticate(AuthenticationRequestPassword.class), is(false));
+        assertThat(authenticator.authenticate(new AuthenticationRequestPassword("dummy", "dummy"), "unused"), is(nullValue()));
     }
 
     @Test
@@ -85,26 +91,26 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
         SecurityUtils.setSecurityManager(securityManager);
 
         
-        assertThat(authOrAuth.canAuthenticate(AuthenticationRequestPassword.class), is(true));
+        assertThat(authenticator.canAuthenticate(AuthenticationRequestPassword.class), is(true));
 
         AuthenticationRequest ar = new AuthenticationRequestPassword("lonestarr", "vespa");
-        AuthenticationSession isisAuthSession = authOrAuth.authenticate(ar, null);
+        AuthenticationSession isisAuthSession = authenticator.authenticate(ar, null);
 
         assertThat(isisAuthSession, is(not(nullValue())));
         assertThat(isisAuthSession.getUserName(), is("lonestarr"));
         assertThat(isisAuthSession.getValidationCode(), is(nullValue()));
 
         Identifier changeAddressIdentifier = Identifier.actionIdentifier("com.mycompany.myapp.Customer", "changeAddress", String.class, String.class);
-        assertThat(authOrAuth.isVisibleInAnyRole(changeAddressIdentifier), is(true));
+        assertThat(authorizor.isVisibleInAnyRole(changeAddressIdentifier), is(true));
 
         Identifier changeEmailIdentifier = Identifier.actionIdentifier("com.mycompany.myapp.Customer", "changeEmail", String.class);
-        assertThat(authOrAuth.isVisibleInAnyRole(changeEmailIdentifier), is(true));
+        assertThat(authorizor.isVisibleInAnyRole(changeEmailIdentifier), is(true));
 
         Identifier submitOrderIdentifier = Identifier.actionIdentifier("com.mycompany.myapp.Order", "submit");
-        assertThat(authOrAuth.isVisibleInAnyRole(submitOrderIdentifier), is(true));
+        assertThat(authorizor.isVisibleInAnyRole(submitOrderIdentifier), is(true));
 
         Identifier cancelOrderIdentifier = Identifier.actionIdentifier("com.mycompany.myapp.Order", "cancel");
-        assertThat(authOrAuth.isVisibleInAnyRole(cancelOrderIdentifier), is(false));
+        assertThat(authorizor.isVisibleInAnyRole(cancelOrderIdentifier), is(false));
     }
 
 
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index d2de366..a20fbd6 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -37,6 +37,8 @@ import org.apache.isis.core.security.authentication.AuthenticationRequest;
 import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.shiro.authentication.ShiroAuthenticator;
+import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -48,20 +50,25 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
 
     @Mock
     private IsisConfiguration mockConfiguration;
-
-    private ShiroAuthenticatorOrAuthorizor authOrAuth;
+    
+    private ShiroAuthenticator authenticator;
+    private ShiroAuthorizor authorizor;
 
     @Before
     public void setUp() throws Exception {
-    	
-        // PRODUCTION
         
+        // PRODUCTION
+
         _Config.clear();
         _Config.put("isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated", false);
-    	
-        authOrAuth = new ShiroAuthenticatorOrAuthorizor();
-        authOrAuth.init();
+        
+        authenticator = new ShiroAuthenticator();
+        authorizor = new ShiroAuthorizor();
+        
+        authenticator.init();
+        authorizor.init();
     }
+    
 
     @After
     public void tearDown() throws Exception {
@@ -80,11 +87,11 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
         SecurityUtils.setSecurityManager(securityManager);
 
         AuthenticationRequest ar = new AuthenticationRequestPassword("darkhelmet", "ludicrousspeed");
-        authOrAuth.authenticate(ar, null);
+        authenticator.authenticate(ar, null);
 
         // when, then
         Identifier changeAddressIdentifier = Identifier.actionIdentifier("com.mycompany.myapp.Customer", "changeAddress", String.class, String.class);
-        assertThat(authOrAuth.isVisibleInAnyRole(changeAddressIdentifier), is(true));
+        assertThat(authorizor.isVisibleInAnyRole(changeAddressIdentifier), is(true));
 
     }
 
@@ -97,11 +104,11 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
         SecurityUtils.setSecurityManager(securityManager);
 
         AuthenticationRequest ar = new AuthenticationRequestPassword("lonestarr", "vespa");
-        authOrAuth.authenticate(ar, null);
+        authenticator.authenticate(ar, null);
         
         // when, then
         Identifier removeCustomerIdentifier = Identifier.actionIdentifier("com.mycompany.myapp.Customer", "remove");
-        assertThat(authOrAuth.isVisibleInAnyRole(removeCustomerIdentifier), is(true));
+        assertThat(authorizor.isVisibleInAnyRole(removeCustomerIdentifier), is(true));
     }
 
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
index 574981b..13e0031 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
@@ -27,15 +27,12 @@ import java.util.SortedSet;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.collections._Sets;
 
 final class ServicesInstallerUtils  {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromConfiguration.class);
+    //private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromConfiguration.class);
 
     private static final char DELIMITER = '#';
 
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java b/core/security/src/main/java/org/apache/isis/core/security/authspi/SecurityAuthPlugin.java
similarity index 57%
copy from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java
copy to core/security/src/main/java/org/apache/isis/core/security/authspi/SecurityAuthPlugin.java
index 90f1053..41cfd12 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authspi/SecurityAuthPlugin.java
@@ -16,26 +16,36 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.security.shiro.authentication;
+package org.apache.isis.core.security.authspi;
 
 import java.util.List;
+import java.util.Set;
 
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
+import org.apache.isis.commons.internal.context._Plugin;
 import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.security.shiro.ShiroAuthenticatorOrAuthorizor;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
 
-public class ShiroAuthenticationManagerInstaller
-extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
-
-    public static String NAME = "shiro";
-
-    public ShiroAuthenticationManagerInstaller() {
-        super(NAME);
-    }
+/**
+ * @since 2.0.0-M2
+ * 
+ * For now this is just a stub, meant to replace Installers. 
+ * 
+ */
+public interface SecurityAuthPlugin {
 
-    @Override
-    protected List<Authenticator> createAuthenticators() {
-        return _Lists.singleton(new ShiroAuthenticatorOrAuthorizor());
+    // -- INTERFACE
+    
+    public List<Authenticator> getAuthenticators();
+    public List<Authorizor> getAuthorizors();
+    
+    // -- LOOKUP
+    
+    /**
+     * not cached
+     * @return
+     */
+    public static Set<SecurityAuthPlugin> loadAll() {
+        return _Plugin.loadAll(SecurityAuthPlugin.class);
     }
+    
 }


[isis] 02/02: ISIS-2033: Major (interim): thrown away Installers and Guice

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit f8812eb8a884b796ae445dc232ba81eb2d291c06
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 18 18:04:43 2018 +0100

    ISIS-2033: Major (interim): thrown away Installers and Guice
    
    prepare for full provisioning utilizing CDI
    
    this commit breaks provisioning and SudoService
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
 .../java/org/apache/isis/applib/AppManifest.java   |  23 ++-
 .../conmap/ContentMappingServiceForCommandDto.java |   9 +-
 .../isis/applib/fixturescripts/FixtureScript.java  |  35 +---
 .../isis/applib/fixturescripts/FixtureScripts.java |  36 +---
 .../services/confview/ConfigurationMenu.java       |   5 +-
 .../fixturespec/FixtureScriptsDefault.java         |  18 +-
 .../isis/applib/services/jaxb/JaxbService.java     |   3 +-
 .../applib/services/jaxb/JaxbServiceDefault.java   |  16 +-
 .../applib/services/layout/LayoutServiceMenu.java  |   4 +-
 .../services/metamodel/MetaModelServicesMenu.java  |   3 +-
 .../services/routing/RoutingServiceDefault.java    |  17 +-
 .../services/swagger/SwaggerServiceMenu.java       |   5 +-
 .../bootstrap3/BS3MenuBars_roundtrip_Test.java     |   2 +-
 core/commons/pom.xml                               |   8 +
 .../org/apache/isis/commons/internal/cdi/_CDI.java |  27 ++-
 .../commons/internal/exceptions/_Exceptions.java   |   6 +
 .../components/ApplicationScopedComponent.java     |  36 ----
 .../isis/core/commons/components/Installer.java    |  48 -----
 .../core/commons/components/InstallerAbstract.java |  97 ---------
 .../isis/core/plugins/eventbus/EventBusPlugin.java |   2 +-
 .../apache/isis/core/plugins/ioc/IocPlugin.java    |  50 +++++
 .../org/apache/isis/config/AppConfigLocator.java   |   8 +-
 .../org/apache/isis/config/AppManifestFinder.java  |  83 --------
 .../org/apache/isis/config/IsisConfiguration.java  |   6 +
 .../apache/isis/config/beans/WebAppConfigBean.java |  20 ++
 .../config/builder/IsisConfigurationDefault.java   |  17 +-
 .../view/ConfigurationViewServiceDefault.java      |   9 +-
 core/mavendeps/webapp/pom.xml                      |   5 +
 .../core/metamodel/services/ServicesInjector.java  |   3 +-
 .../appfeat/ApplicationFeatureFactory.java         |   9 +-
 .../ApplicationFeatureRepositoryDefault.java       |  11 +-
 .../services/appmanifest/AppManifestProvider.java  |   1 +
 .../bookmarks/BookmarkServiceInternalDefault.java  |   8 +-
 .../exceprecog/ExceptionRecognizerDocDefault.java  |   8 +-
 .../factory/FactoryServiceInternalDefault.java     |  21 +-
 .../services/grid/GridLoaderServiceDefault.java    |  23 +--
 .../services/grid/GridServiceDefault.java          |  36 ++--
 .../services/grid/GridSystemServiceAbstract.java   |  17 +-
 .../grid/bootstrap3/GridSystemServiceBS3.java      |  13 +-
 .../services/layout/LayoutServiceDefault.java      |  25 +--
 .../services/message/MessageServiceNoop.java       |   8 +-
 .../metamodel/MetaModelServiceDefault.java         |  44 ++--
 .../PersistenceSessionServiceInternalNoop.java     |   8 +-
 .../services/registry/ServiceRegistryDefault.java  |  18 +-
 .../RepositoryServiceInternalDefault.java          |   8 +-
 .../services/swagger/SwaggerServiceDefault.java    |  18 +-
 .../services/title/TitleServiceDefault.java        |  17 +-
 .../services/user/UserServiceDefault.java          | 202 +++++++++---------
 .../metamodel/specloader/SpecificationLoader.java  |   6 +-
 .../specloader/validator/MetaModelValidator.java   |   3 +-
 .../core/metamodel/services/grid/BS3GridTest.java  |  15 +-
 .../services/menubars/BS3MenuBarsTest.java         |   2 +-
 core/plugins/ioc-weld/pom.xml                      | 127 ++++++++++++
 .../core/plugins/ioc/weld/IocPluginUsingWeld.java  |  38 ++++
 .../isis/core/plugins/ioc/weld/WeldFactory.java    | 115 +++++++++++
 .../org.apache.isis.core.plugins.ioc.IocPlugin     |   1 +
 .../services/jdosupport/IsisJdoSupportDN4.java     |  12 +-
 .../DataNucleusApplicationComponents4.java         |   7 +-
 .../persistence/PersistenceSessionFactory4.java    |   3 +-
 .../service/eventbus/EventBusServiceJdo.java       |   9 +-
 .../services/jdosupport/IsisJdoSupportDN5.java     |  12 +-
 .../DataNucleusApplicationComponents5.java         |   3 +-
 .../persistence/PersistenceSessionFactory5.java    |   3 +-
 .../service/eventbus/EventBusServiceJdo.java       |   9 +-
 .../Pac4jAuthenticationManagerInstaller.java       |  40 ----
 .../pac4j/authentication/Pac4jAuthenticator.java   |  12 +-
 .../Pac4jAuthorizationManagerInstaller.java        |  37 ----
 .../apache/isis/security/shiro/ShiroConstants.java |  34 ----
 .../ShiroAuthenticationManagerInstaller.java       |  40 ----
 .../shiro/authentication/ShiroAuthenticator.java   |   5 +-
 .../ShiroAuthorizationManagerInstaller.java        |  37 ----
 .../shiro/authorization/ShiroAuthorizor.java       |   5 +-
 core/pom.xml                                       |  25 +--
 ...eptionRecognizerCompositeForJdoObjectStore.java |  11 +-
 .../apache/isis/core/runtime/RuntimeModule.java    |   5 +
 .../PersistenceMechanismInstaller.java             |  32 ---
 .../runtime/runner/opts/OptionHandlerPassword.java |  66 ------
 .../runtime/runner/opts/OptionHandlerUser.java     |  67 ------
 .../core/runtime/services/ServicesInstaller.java   |  38 ----
 .../services/ServicesInstallerAbstract.java        |  30 ---
 .../services/ServicesInstallerFromAnnotation.java  | 139 -------------
 .../ServicesInstallerFromConfiguration.java        | 122 -----------
 ...cesInstallerFromConfigurationAndAnnotation.java |  96 ---------
 .../runtime/services/ServicesInstallerUtils.java   |  94 ---------
 .../services/auditing/AuditingServiceInternal.java |  36 ++--
 .../AuthenticationSessionProviderDefault.java      |  35 ++--
 .../background/BackgroundServiceDefault.java       |  44 ++--
 .../background/CommandExecutorServiceDefault.java  |  30 +--
 .../changes/ChangedObjectsServiceInternal.java     |   6 -
 .../command/CommandDtoServiceInternalDefault.java  |   8 +-
 .../services/command/CommandServiceDefault.java    |   9 +-
 .../services/email/EmailServiceDefault.java        |  12 +-
 .../homepage/HomePageProviderServiceDefault.java   |   9 +-
 .../services/i18n/po/TranslationServicePo.java     |   8 +-
 .../ixn/InteractionDtoServiceInternalDefault.java  |   9 +-
 .../menubars/MenuBarsLoaderServiceDefault.java     |   6 +-
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    |   4 +-
 .../services/message/MessageServiceDefault.java    |   9 +-
 .../services/metrics/MetricsServiceDefault.java    |   6 -
 .../PersistenceSessionServiceInternalDefault.java  |  19 +-
 .../publish/PublishingServiceInternalDefault.java  |  40 +---
 .../sessmgmt/SessionManagementServiceDefault.java  |  10 +-
 .../runtime/services/sudo/SudoServiceDefault.java  |  16 +-
 .../userprof/UserProfileServiceDefault.java        |   8 +-
 .../userreg/EmailNotificationServiceDefault.java   |  18 +-
 .../services/xactn/TransactionServiceDefault.java  |   9 +-
 .../xmlsnapshot/XmlSnapshotServiceDefault.java     |   9 +-
 .../isis/core/runtime/system/SystemConstants.java  |  39 ----
 .../runtime/system/session}/IsisInjectModule.java  |  55 ++---
 .../runtime/system/session/IsisSessionFactory.java |   8 +-
 .../system/session/IsisSessionFactoryBuilder.java  |   4 -
 .../IsisComponentProvider.java                     |  20 --
 ...sisComponentProviderHelper_UsingInstallers.java | 226 ---------------------
 .../isis/core/wrapper/WrapperFactoryDefault.java   |  17 +-
 .../service/support/TimestampService.java          |   6 -
 .../BypassAuthenticationManagerInstaller.java      |  47 -----
 .../manager/AuthenticationManager.java             |   3 +-
 .../manager/AuthenticationManagerInstaller.java    |  30 ---
 ...gerStandardInstallerAbstractForDfltRuntime.java |  56 -----
 ...enticationManagerStandardInstallerAbstract.java |  59 ------
 .../authentication/standard/Authenticator.java     |   3 +-
 .../authentication/standard/Registrar.java         |   3 +-
 .../BypassAuthorizationManagerInstaller.java       |  36 ----
 .../manager/AuthorizationManager.java              |   3 +-
 .../manager/AuthorizationManagerInstaller.java     |  30 ---
 ...horizationManagerStandardInstallerAbstract.java |  98 ---------
 .../authorization/standard/Authorizor.java         |   3 +-
 .../RepresentationServiceContentNegotiator.java    |  18 +-
 .../ContentNegotiationServiceXRoDomainType.java    |   6 +-
 core/viewer-wicket-impl/pom.xml                    |  12 +-
 .../wicket/viewer/IsisWicketApplication.java       |  92 ++++-----
 .../viewer/wicket/viewer/IsisWicketModule.java     | 144 +++++--------
 .../imagecache/ImageResourceCacheClassPath.java    |   3 +-
 .../ComponentFactoryRegistrarDefault.java          |   7 +-
 .../ComponentFactoryRegistryDefault.java           |   5 +-
 .../registries/pages/PageClassListDefault.java     |   8 +-
 .../registries/pages/PageClassRegistryDefault.java |  18 +-
 .../pages/PageNavigationServiceDefault.java        |  11 +-
 .../viewer/services/DeepLinkServiceWicket.java     |  22 +-
 .../services/EmailNotificationServiceWicket.java   |   4 +-
 .../wicket/viewer/services/EmailServiceWicket.java |  55 -----
 .../viewer/services/GuiceBeanProviderWicket.java   |  56 -----
 .../settings/WicketViewerSettingsDefault.java      |   2 +-
 .../isisWicketModule_bindingsStandard_Test.java    | 155 ++++++--------
 ...ageClassListDefault_RegistrationAndCaching.java |   5 +-
 .../pages/PageClassListDefault_Instantiation.java  |  17 +-
 core/viewer-wicket-ui/pom.xml                      |  11 -
 .../wicket/ui/components/about/AboutPanel.java     |  26 +--
 .../serviceactions/TertiaryActionsPanel.java       |  11 +-
 .../bookmarkedpages/BookmarkedPagesPanel.java      |   6 +-
 .../entity/icontitle/EntityIconAndTitlePanel.java  |   8 +-
 .../wicket/ui/components/footer/CreditName.java    |   1 +
 .../wicket/ui/components/footer/FooterPanel.java   |  15 +-
 .../scalars/ScalarPanelTextFieldAbstract.java      |   4 +-
 .../ScalarPanelTextFieldDatePickerAbstract.java    |   4 +-
 .../scalars/reference/ReferencePanel.java          |   4 +-
 .../valuechoices/ValueChoicesSelect2Panel.java     |   4 +-
 .../wicket/ui/components/welcome/WelcomePanel.java |  12 +-
 .../ui/components/widgets/favicon/Favicon.java     |  22 +-
 .../ui/components/widgets/navbar/BrandLogo.java    |  18 +-
 .../ui/components/widgets/navbar/BrandName.java    |  25 +--
 .../wicket/ui/errors/ExceptionStackTracePanel.java |  25 ++-
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |  41 +---
 .../accmngt/AccountManagementPageAbstract.java     |  27 +--
 .../password_reset/PasswordResetEmailPanel.java    |  33 +--
 .../pages/accmngt/signup/RegistrationFormPage.java |   5 +-
 .../accmngt/signup/RegistrationFormPanel.java      |  31 +--
 .../wicket/ui/pages/login/IsisSignInPanel.html     |  40 +++-
 .../wicket/ui/pages/login/IsisSignInPanel.java     |  16 +-
 .../wicket/ui/pages/login/WicketLogoutPage.java    |   8 +-
 .../wicket/ui/pages/login/WicketSignInPage.css     |   4 +
 .../wicket/ui/pages/login/WicketSignInPage.html    |  17 +-
 .../ui/pages/login/WicketSignInPage.properties     |   1 +
 .../wicket/ui/pages/mmverror/MmvErrorPage.java     |  40 ++--
 .../viewer/wicket/ui/panels/PanelAbstract.java     |   6 +-
 .../wicket/ui/panels/PromptFormPanelAbstract.java  |   9 +-
 example/application/helloworld/pom.xml             |   6 +
 .../application/HelloWorldAppManifest.java         |   8 +-
 .../java/domainapp/dom/impl/HelloWorldObjects.java |   8 +-
 179 files changed, 1411 insertions(+), 3227 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
index a30dc03..390dc77 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
@@ -20,16 +20,19 @@
 package org.apache.isis.applib;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Stream;
 
 import javax.jdo.annotations.PersistenceCapable;
 
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.fixturescripts.FixtureScript;
+import org.apache.isis.commons.internal.collections._Lists;
 
 /**
  * Programmatic specification of the constituent parts of an application, most specifically the modules that contain
@@ -254,7 +257,25 @@ public interface AppManifest {
         public void setXmlElementTypes(final Set<Class<?>> xmlElementTypes) {
             this.xmlElementTypes = xmlElementTypes;
         }
-        //endregion
+       
+        // -- STREAM ALL
+        
+        /**
+         * @since 2.0.0-M2
+         */
+        public Stream<Class<?>> streamAllTypes() {
+
+            return _Lists.of(persistenceCapableTypes,
+                    mixinTypes,
+                    fixtureScriptTypes,
+                    domainServiceTypes,
+                    domainObjectTypes,
+                    viewModelTypes,
+                    xmlElementTypes)
+            .stream()
+            .flatMap(Collection::stream)
+            ;
+        }
 
     }
     
diff --git a/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingServiceForCommandDto.java b/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingServiceForCommandDto.java
index 1d59aea..68643b4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingServiceForCommandDto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingServiceForCommandDto.java
@@ -21,6 +21,8 @@ package org.apache.isis.applib.conmap;
 import java.sql.Timestamp;
 import java.util.List;
 
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 
@@ -145,10 +147,7 @@ public class ContentMappingServiceForCommandDto implements ContentMappingService
     }
 
 
-    @Inject
-    MetaModelService metaModelService;
-
-    @Inject
-    List<CommandDtoProcessorService> commandDtoProcessorServices;
+    @Inject MetaModelService metaModelService;
+    @Inject @Any Instance<CommandDtoProcessorService> commandDtoProcessorServices;
 
 }
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index f32dc3b..c301e71 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -27,6 +27,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 
@@ -1013,30 +1015,13 @@ implements InstallableFixture {
 
     // -- injected services
 
-    @javax.inject.Inject
-    protected FixtureScripts fixtureScripts;
-
-    @javax.inject.Inject
-    protected FactoryService factoryService;
-
-    @javax.inject.Inject
-    protected ServiceRegistry serviceRegistry;
-
-    @javax.inject.Inject
-    protected RepositoryService repositoryService;
-
-    @javax.inject.Inject
-    protected UserService userService;
-
-    @javax.inject.Inject
-    protected WrapperFactory wrapperFactory;
-
-    @javax.inject.Inject
-    protected TransactionService transactionService;
-
-    @javax.inject.Inject
-    protected SessionManagementService sessionManagementService;
-
-
+    @Inject protected FixtureScripts fixtureScripts;
+    @Inject protected FactoryService factoryService;
+    @Inject protected ServiceRegistry serviceRegistry;
+    @Inject protected RepositoryService repositoryService;
+    @Inject protected UserService userService;
+    @Inject protected WrapperFactory wrapperFactory;
+    @Inject protected TransactionService transactionService;
+    @Inject protected SessionManagementService sessionManagementService;
 
 }
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
index e3e4a05..a1ee6b2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
@@ -28,6 +28,7 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.isis.applib.AbstractService;
@@ -466,31 +467,14 @@ public abstract class FixtureScripts extends AbstractService {
 
     // -- injected services
 
-    @javax.inject.Inject
-    FactoryService factoryService;
-
-    @javax.inject.Inject
-    TitleService titleService;
-
-    @javax.inject.Inject
-    JaxbService jaxbService;
-
-    @javax.inject.Inject
-    BookmarkService bookmarkService;
-
-    @javax.inject.Inject
-    ServiceRegistry serviceRegistry;
-
-    @javax.inject.Inject
-    RepositoryService repositoryService;
-
-    @javax.inject.Inject
-    TransactionService transactionService;
-
-    @javax.inject.Inject
-    ClassDiscoveryService classDiscoveryService;
-
-    @javax.inject.Inject
-    ExecutionParametersService executionParametersService;
+    @Inject FactoryService factoryService;
+    @Inject TitleService titleService;
+    @Inject JaxbService jaxbService;
+    @Inject BookmarkService bookmarkService;
+    @Inject ServiceRegistry serviceRegistry;
+    @Inject RepositoryService repositoryService;
+    @Inject TransactionService transactionService;
+    @Inject ClassDiscoveryService classDiscoveryService;
+    @Inject ExecutionParametersService executionParametersService;
 
 }
\ No newline at end of file
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 12f1c3b..75aa89e 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
@@ -21,6 +21,8 @@ package org.apache.isis.applib.services.confview;
 
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.isis.applib.IsisApplibModule;
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.ActionLayout;
@@ -62,7 +64,6 @@ public class ConfigurationMenu {
         return configurationService.allProperties();
     }
 
-    @javax.inject.Inject
-    private ConfigurationViewService configurationService;
+    @Inject private ConfigurationViewService configurationService;
 
 }
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
index 3eb3277..7665d3d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
@@ -21,6 +21,9 @@ package org.apache.isis.applib.services.fixturespec;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.ActionLayout;
@@ -88,10 +91,10 @@ public class FixtureScriptsDefault extends FixtureScripts {
     @Override
     @PostConstruct
     public void init() {
-        if(fixtureScriptsSpecificationProvider == null) {
+        if(fixtureScriptsSpecificationProviders.isUnsatisfied()) {
             return;
         }
-        setSpecification(fixtureScriptsSpecificationProvider.getSpecification());
+        setSpecification(fixtureScriptsSpecificationProviders.get().getSpecification());
     }
 
 
@@ -229,15 +232,14 @@ public class FixtureScriptsDefault extends FixtureScripts {
 
     // -- helpers
     private boolean hideIfPolicyNot(final FixtureScriptsSpecification.DropDownPolicy requiredPolicy) {
-        return fixtureScriptsSpecificationProvider == null || getSpecification().getRunScriptDropDownPolicy() != requiredPolicy;
+        return fixtureScriptsSpecificationProviders.isUnsatisfied() || 
+                getSpecification().getRunScriptDropDownPolicy() != requiredPolicy;
     }
 
-
     // -- injected services
-    @javax.inject.Inject
-    FixtureScriptsSpecificationProvider fixtureScriptsSpecificationProvider;
-    @javax.inject.Inject
-    EventBusService eventBusService;
+    
+    @Inject @Any Instance<FixtureScriptsSpecificationProvider> fixtureScriptsSpecificationProviders;
+    @Inject EventBusService eventBusService;
 
 
 }
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index a676b0a..b3e71d7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -97,8 +97,7 @@ public interface JaxbService {
     @Programmatic
     Map<String, String> toXsd(final Object domainObject, final IsisSchemas isisSchemas);
 
-
-    public static class Simple implements JaxbService {
+    public static abstract class Simple implements JaxbService {
 
         @Override
         public Object fromXml(final JAXBContext jaxbContext, final String xml) {
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 dda4091..f90b863 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
@@ -18,24 +18,21 @@ package org.apache.isis.applib.services.jaxb;
 
 import java.util.Map;
 
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.isis.applib.NonRecoverableException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.domain.DomainObjectList;
 import org.apache.isis.applib.services.metamodel.MetaModelService;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.schema.utils.jaxbadapters.PersistentEntitiesAdapter;
 import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class JaxbServiceDefault extends JaxbService.Simple {
 
     @Override
@@ -93,10 +90,7 @@ public class JaxbServiceDefault extends JaxbService.Simple {
     }
 
 
-    @javax.inject.Inject
-    ServiceRegistry serviceRegistry;
-
-    @javax.inject.Inject
-    MetaModelService metaModelService5;
+    @Inject ServiceRegistry serviceRegistry;
+    @Inject MetaModelService metaModelService5;
 }
 
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 b51dfee..9723b20 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
@@ -18,6 +18,7 @@ package org.apache.isis.applib.services.layout;
 
 import javax.activation.MimeType;
 import javax.activation.MimeTypeParseException;
+import javax.inject.Inject;
 
 import org.apache.isis.applib.IsisApplibModule;
 import org.apache.isis.applib.annotation.Action;
@@ -121,8 +122,7 @@ public class LayoutServiceMenu {
     // //////////////////////////////////////
 
 
-    @javax.inject.Inject
-    LayoutService2 layoutService;
+    @Inject LayoutService2 layoutService;
 
 
 
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 0e4ba23..21e5085 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
@@ -209,7 +209,6 @@ public class MetaModelServicesMenu {
     }
 
 
-    @javax.inject.Inject
-    MetaModelService metaModelService;
+    @Inject MetaModelService metaModelService;
 
 }
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 69a4235..f326bd4 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
@@ -18,22 +18,16 @@
  */
 package org.apache.isis.applib.services.routing;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.homepage.HomePageProviderService;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class RoutingServiceDefault implements RoutingService {
 
-    @SuppressWarnings("unused")
-    private final static Logger LOG = LoggerFactory.getLogger(RoutingServiceDefault.class);
+    // private final static Logger LOG = LoggerFactory.getLogger(RoutingServiceDefault.class);
 
     @Programmatic
     @Override
@@ -47,7 +41,6 @@ public class RoutingServiceDefault implements RoutingService {
         return original != null? original: homePageProviderService.homePage();
     }
 
-    @javax.inject.Inject
-    HomePageProviderService homePageProviderService;
+    @Inject HomePageProviderService homePageProviderService;
 
 }
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 72f8ba6..d15ee3b 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
@@ -16,6 +16,8 @@
  */
 package org.apache.isis.applib.services.swagger;
 
+import javax.inject.Inject;
+
 import org.apache.isis.applib.IsisApplibModule;
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.ActionLayout;
@@ -104,6 +106,5 @@ public class SwaggerServiceMenu {
         return SwaggerService.Format.YAML;
     }
 
-    @javax.inject.Inject
-    SwaggerService swaggerService;
+    @Inject SwaggerService swaggerService;
 }
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java b/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
index 5751e19..023e0d5 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
@@ -33,7 +33,7 @@ public class BS3MenuBars_roundtrip_Test {
 
     @Before
     public void setUp() throws Exception {
-        jaxbService = new JaxbService.Simple();
+        jaxbService = new JaxbService.Simple() {};
     }
 
     @After
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 5a2d3e6..8d6e253 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -36,6 +36,8 @@
     <properties>
         <jar-plugin.automaticModuleName>org.apache.isis.commons</jar-plugin.automaticModuleName>
         <git-plugin.propertiesDir>org/apache/isis/commons</git-plugin.propertiesDir>
+        
+        <lombok.version>1.18.4</lombok.version>
     </properties>
 
     <build>
@@ -71,6 +73,12 @@
         	<artifactId>annotations</artifactId>
         </dependency>
         
+        <dependency>
+        	<groupId>org.projectlombok</groupId>
+        	<artifactId>lombok</artifactId>
+        	<version>${lombok.version}</version>
+        </dependency>
+
     </dependencies>
 
     <profiles>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java b/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
index 0e26c48..dc56eb6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
@@ -23,11 +23,16 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.enterprise.inject.spi.CDI;
 import javax.inject.Qualifier;
 
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.plugins.ioc.IocPlugin;
+
+import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
 
 /**
  * <h1>- internal use only -</h1>
@@ -41,6 +46,22 @@ import org.apache.isis.commons.internal.base._NullSafe;
  */
 public final class _CDI {
     
+    public static void init(Supplier<Stream<Class<?>>> onDiscover) {
+        
+        if(cdi().isPresent()) {
+            return;
+        }
+        
+        CDI.setCDIProvider(IocPlugin.get().getCDIProvider(onDiscover.get()));
+
+        // verify
+        if(!cdi().isPresent()) {
+            throw _Exceptions.unexpectedCodeReach();
+        }
+        
+    }
+    
+    
     /**
      * Obtains a child Instance for the given required type and additional required qualifiers. 
      * @param subType
@@ -49,7 +70,7 @@ public final class _CDI {
      * instance of an annotation that is not a qualifier type
      */
     public static <T> Optional<T> getManagedBean(final Class<T> subType, List<Annotation> qualifiers) {
-        if(_NullSafe.isEmpty(qualifiers)) {
+        if(isEmpty(qualifiers)) {
             return getManagedBean(subType);
         }
         
@@ -93,7 +114,7 @@ public final class _CDI {
      * @return non-null
      */
     public static List<Annotation> filterQualifiers(final Annotation[] annotations) {
-        return _NullSafe.stream(annotations)
+        return stream(annotations)
         .filter(_CDI::isQualifier)
         .collect(Collectors.toList());
     }
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java b/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
index 214936a..c2c4a80 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
@@ -82,6 +82,10 @@ public final class _Exceptions {
         return new IllegalStateException("internal error: code was reached, that is not implemented yet");
     }
     
+    public static RuntimeException unrecoverable(Exception cause) {
+        return new RuntimeException("internal error: unrecoverable error with cause ...", cause);
+    }
+    
     /**
     * Used to hide from the compiler the fact, that this call always throws.
     *
@@ -313,5 +317,7 @@ public final class _Exceptions {
         }
     }
 
+    
+
 
 }
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java b/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java
deleted file mode 100644
index 75cbc6b..0000000
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.commons.components;
-
-/**
- * Indicate that the implementing component is scoped at application level
- * (shared across multiple sessions) and might also require initialization or
- * being shutdown.
- *
- * <p>
- * Analogous to Hibernate's <tt>SessionFactory</tt>.
- *
- * @see SessionScopedComponent
- * @see TransactionScopedComponent
- */
-public interface ApplicationScopedComponent extends Component {
-
-
-}
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java b/core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java
deleted file mode 100644
index d3dffcf..0000000
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.commons.components;
-
-import java.util.List;
-
-/**
- * A factory for a {@link Component}, defining that component's
- * {@link #getType() type} and its {@link #getName() name}.
- *
- * <p>
- * The ({@link #getType() type}, {@link #getName() name}) is expected to be a
- * unique identifier of a component.
- *
- * <p>
- * The <i>default runtime</i> (<tt>org.apache.isis.runtimes.dflt</tt> module),
- * which adopts a service locator design, uses the
- * <tt>installer-registry.properties</tt> resource as a registry of all
- * available installers. The installers are loaded and indexed by their name and
- * type. Other runtime implementations may use different approaches.
- */
-public interface Installer extends ApplicationScopedComponent {
-
-
-    /**
-     * The name (qualified by type).
-     */
-    String getName();
-
-    List<Class<?>> getTypes();
-}
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java b/core/commons/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
deleted file mode 100644
index 66c121b..0000000
--- a/core/commons/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.commons.components;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.isis.commons.internal.collections._Lists;
-
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
-public abstract class InstallerAbstract implements Installer {
-
-    // -- constructor, fields
-
-    private final String name;
-
-    /**
-     * Subclasses should pass in the type defined as a constant in the
-     * subinterface of Installer.
-     *
-     * <p>
-     * For example, <tt>PersistenceMechanismInstaller</tt> has a constant
-     * <tt>PersistenceMechanismInstaller#TYPE</tt>. Any implementation of
-     * <tt>PersistenceMechanismInstaller</tt> should pass this constant value up
-     * to this constructor.
-     */
-    public InstallerAbstract(final String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    // -- init, shutdown
-
-    /**
-     * Default implementation does nothing.
-     */
-    public void init() {
-        // no-op implementation, subclasses may override!
-    }
-
-    /**
-     * Default implementation does nothing.
-     */
-    public void shutdown() {
-        // no-op implementation, subclasses may override!
-    }
-
-
-
-    // -- helpers (for subclasses)
-
-    /**
-     * Helper for subclasses implementing {@link #getTypes()}.
-     */
-    protected static List<Class<?>> listOf(final Class<?>... classes) {
-        return Collections.unmodifiableList(
-                stream(classes)
-                .collect(Collectors.toList())   );
-    }
-
-    /**
-     * Helper for subclasses implementing {@link #getTypes()}.
-     */
-    protected static List<Class<?>> listOf(final List<Class<?>> classList, final Class<?>... classes) {
-        final List<Class<?>> arrayList = _Lists.<Class<?>> newArrayList(classList);
-        stream(classes)
-        .forEach(arrayList::add);
-        return Collections.unmodifiableList(arrayList);
-    }
-
-
-
-}
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/eventbus/EventBusPlugin.java b/core/commons/src/main/java/org/apache/isis/core/plugins/eventbus/EventBusPlugin.java
index e2e3b05..dadc910 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/eventbus/EventBusPlugin.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/eventbus/EventBusPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with
  *  this work for additional information regarding copyright ownership.
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/IocPlugin.java b/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/IocPlugin.java
new file mode 100644
index 0000000..40821d5
--- /dev/null
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/ioc/IocPlugin.java
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.core.plugins.ioc;
+
+import java.util.stream.Stream;
+
+import javax.enterprise.inject.spi.CDIProvider;
+
+import org.apache.isis.commons.internal.context._Plugin;
+
+/**
+ * 
+ * @since 2.0.0-M2
+ *
+ */
+public interface IocPlugin {
+
+    // -- INTERFACE
+
+    public CDIProvider getCDIProvider(Stream<Class<?>> discover);
+
+    // -- LOOKUP
+
+    public static IocPlugin get() {
+        
+        return _Plugin.getOrElse(IocPlugin.class,
+                ambiguousPlugins->{
+                    return _Plugin.pickAnyAndWarn(IocPlugin.class, ambiguousPlugins);
+                },
+                ()->{
+                    throw _Plugin.absenceNonRecoverable(IocPlugin.class);
+                });
+    }
+    
+
+}
diff --git a/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java b/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
index 0abdb01..be4b544 100644
--- a/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
+++ b/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
@@ -18,11 +18,17 @@ public final class AppConfigLocator {
     private AppConfigLocator() { }
     
     public static AppConfig getAppConfig() {
-        return _Context.computeIfAbsent(AppConfig.class, __->lookupAppConfig());
+        return _Context.computeIfAbsent(AppConfig.class, __->lookupAppConfigAndInitCDI());
     }
     
     // -- HELPER
     
+    private static AppConfig lookupAppConfigAndInitCDI() {
+        final AppConfig appConfig = lookupAppConfig();
+        _CDI.init(appConfig.isisConfiguration()::streamClassesToDiscover);
+        return appConfig;
+    }
+    
     private static AppConfig lookupAppConfig() {
         
         AppConfig appConfig;
diff --git a/core/config/src/main/java/org/apache/isis/config/AppManifestFinder.java b/core/config/src/main/java/org/apache/isis/config/AppManifestFinder.java
deleted file mode 100644
index c82a2c8..0000000
--- a/core/config/src/main/java/org/apache/isis/config/AppManifestFinder.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.config;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.applib.AppManifest;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.context._Context;
-
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-import static org.apache.isis.commons.internal.base._Strings.isNullOrEmpty;
-
-/**
- * 
- * @since 2.0.0-M2
- * 
- * @deprecated does not work, use {@link AppManifestLocator instead}
- */
-class AppManifestFinder {
-    
-    private static final Logger LOG = LoggerFactory.getLogger(AppManifestFinder.class);
-
-    static AppManifest findAppMainfestOrThrow() {
-        
-        // lookup all sorts of places for 'isis.properties' and other;
-        // see if we can find an entry 'isis.appManifest=xxx'
-        // that points to the AppManifest to use
-        
-        final String manifestKey = ConfigurationConstants.APP_MANIFEST_KEY;
-        
-        final String appManifestClassName = 
-            _Strings.read(_Context.getDefaultClassLoader().getResourceAsStream("/META-INF/app.manifest"), 
-                    StandardCharsets.UTF_8);
-        
-        //final String appManifestClassName = _Config.peekAtString(manifestKey);
-        if(isNullOrEmpty(appManifestClassName)) {
-            throw new IsisConfigurationException(
-                    String.format("Failed to find AppManifest from config properties. No value for key '%s' found.", 
-                            manifestKey));
-        }
-        Object appManifest;
-        try {
-            appManifest = _Context.loadClassAndInitialize(appManifestClassName);
-        } catch (ClassNotFoundException e) {
-            throw new IsisConfigurationException(
-                    String.format("Failed to instantiate AppManifest from config value '%s'.", 
-                            appManifestClassName));
-        }
-        return uncheckedCast(appManifest);
-    }
-    
-    static Optional<AppManifest> findAppMainfest() {
-        try {
-            return Optional.ofNullable(findAppMainfestOrThrow());
-        } catch (Exception e) {
-            LOG.warn(e.getMessage());
-            return Optional.empty();
-        }
-    }
-    
-    
-}
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 a0e0717..a20e87c 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
@@ -23,6 +23,7 @@ import java.awt.Color;
 import java.awt.Font;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import org.apache.isis.applib.AppManifest;
 import org.apache.isis.applib.Module;
@@ -115,6 +116,11 @@ public interface IsisConfiguration {
      * @since 2.0.0-M2
      */
     public AppManifest getAppManifest();
+    
+    /**
+     * @since 2.0.0-M2
+     */
+    public Stream<Class<?>> streamClassesToDiscover();
 
     /**
      * Creates a new IsisConfiguration containing the properties starting with
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/WebAppConfigBean.java b/core/config/src/main/java/org/apache/isis/config/beans/WebAppConfigBean.java
new file mode 100644
index 0000000..f998110
--- /dev/null
+++ b/core/config/src/main/java/org/apache/isis/config/beans/WebAppConfigBean.java
@@ -0,0 +1,20 @@
+package org.apache.isis.config.beans;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data @Builder
+public class WebAppConfigBean {
+
+    private String applicationName;
+    private String applicationVersion;
+    private String aboutMessage;
+    private String welcomeMessage;
+    private String faviconUrl;
+    private String faviconContentType;
+    private String brandLogoHeader;
+    private String brandLogoSignin;
+    private String applicationCss;
+    private String applicationJs;
+    
+}
diff --git a/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java b/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java
index b992aae..fa86bc4 100644
--- a/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java
@@ -27,13 +27,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.stream.Stream;
+
+import javax.enterprise.inject.Vetoed;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.isis.applib.AppManifest;
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.Nature;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.collections._Lists;
@@ -57,8 +58,7 @@ import static org.apache.isis.commons.internal.base._With.requires;
  *     will be used instead.
  * </p>
  */
-//[2039] @DomainObject(objectType=...) fixes meta-data validation complaining, otherwise not required ...
-@DomainObject(nature=Nature.INMEMORY_ENTITY, objectType="internal.IsisConfiguration") 
+@Vetoed
 class IsisConfigurationDefault implements IsisConfiguration {
 
     private static final Logger LOG = LoggerFactory.getLogger(IsisConfigurationDefault.class);
@@ -111,6 +111,13 @@ class IsisConfigurationDefault implements IsisConfiguration {
         typeDiscovery.get();
     }
     
+    @Override
+    public Stream<Class<?>> streamClassesToDiscover() {
+        triggerTypeDiscovery();
+        return AppManifest.Registry.instance().streamAllTypes();
+    }
+    
+    
     // ////////////////////////////////////////////////
     // ResourceStreamSource
     // ////////////////////////////////////////////////
@@ -514,4 +521,6 @@ class IsisConfigurationDefault implements IsisConfiguration {
     }
 
 
+
+
 }
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 e68100c..1355f1e 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
@@ -23,8 +23,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.services.confview.ConfigurationProperty;
 import org.apache.isis.applib.services.confview.ConfigurationViewService;
 import org.apache.isis.commons.internal.base._Lazy;
@@ -36,10 +36,7 @@ import org.apache.isis.config.internal._Config;
 /**
  * @since 2.0.0-M2
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class ConfigurationViewServiceDefault implements ConfigurationViewService {
     
     @Override
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index 3355a0e..393cc91 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -60,6 +60,11 @@
                     <groupId>org.apache.isis.core</groupId>
                     <artifactId>isis-core-security</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.isis.core</groupId>
+                    <artifactId>isis-core-plugins-security-shiro</artifactId>
+                </dependency>
+                
             </dependencies>
         </profile>
         <profile>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
index 32307d2..5ab2df3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
@@ -44,7 +44,6 @@ import org.apache.isis.commons.internal.collections._Multimaps;
 import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.util.ToString;
 import org.apache.isis.core.metamodel.exceptions.MetaModelException;
 import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
@@ -66,7 +65,7 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
  * </p>
  *
  */
-public class ServicesInjector implements ApplicationScopedComponent, ServiceRegistry {
+public class ServicesInjector implements ServiceRegistry {
 
 
     private static final Logger LOG = LoggerFactory.getLogger(ServicesInjector.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 6c4dcae..9d52691 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,14 +18,11 @@
  */
 package org.apache.isis.core.metamodel.services.appfeat;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.services.factory.FactoryService;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 e03f2d6..b1b7835 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
@@ -27,9 +27,8 @@ import java.util.SortedSet;
 import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.annotation.Where;
@@ -58,11 +57,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        repositoryFor = ApplicationFeature.class,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRepository {
 
     // -- caches
@@ -73,8 +68,6 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
     private final SortedMap<ApplicationFeatureId, ApplicationFeature> collectionFeatures = _Maps.newTreeMap();
     private final SortedMap<ApplicationFeatureId, ApplicationFeature> actionFeatures = _Maps.newTreeMap();
 
-
-
     // -- init
 
     private static final String KEY = "isis.services.applicationFeatures.init";
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appmanifest/AppManifestProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appmanifest/AppManifestProvider.java
index 2be3933..727655d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appmanifest/AppManifestProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appmanifest/AppManifestProvider.java
@@ -24,6 +24,7 @@ import org.apache.isis.applib.annotation.Programmatic;
 
 /**
  * Implemented by an internal domain service.
+ * @deprecated we have CDI FIXME
  */
 public interface AppManifestProvider {
 
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 764448a..cc182da 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
@@ -26,10 +26,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
+import javax.ejb.Singleton;
 import javax.inject.Inject;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkHolder;
@@ -53,10 +52,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.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 c0fc1a5..348ca13 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
@@ -21,10 +21,9 @@ package org.apache.isis.core.metamodel.services.exceprecog;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import javax.ejb.Singleton;
 
 import org.apache.isis.applib.RecoverableException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
@@ -32,10 +31,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 18cc118..133f0ab 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
@@ -22,9 +22,10 @@ package org.apache.isis.core.metamodel.services.factory;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
+import javax.ejb.Singleton;
+import javax.inject.Inject;
+
 import org.apache.isis.applib.NonRecoverableException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.factory.FactoryService;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
@@ -35,10 +36,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class FactoryServiceInternalDefault implements FactoryService {
 
 
@@ -95,13 +93,8 @@ public class FactoryServiceInternalDefault implements FactoryService {
                 "Failed to locate constructor in %s to instantiate using %s", mixinClass.getName(), mixedIn));
     }
 
-    @javax.inject.Inject
-    SpecificationLoader specificationLoader;
-
-    @javax.inject.Inject
-    ServiceRegistry serviceRegistry;
-
-    @javax.inject.Inject
-    PersistenceSessionServiceInternal persistenceSessionServiceInternal;
+    @Inject SpecificationLoader specificationLoader;
+    @Inject ServiceRegistry serviceRegistry;
+    @Inject PersistenceSessionServiceInternal persistenceSessionServiceInternal;
 
 }
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 c57f5fc..b621b0f 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
@@ -19,19 +19,20 @@ package org.apache.isis.core.metamodel.services.grid;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.Charset;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.applib.services.grid.GridLoaderService;
@@ -44,10 +45,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class GridLoaderServiceDefault implements GridLoaderService {
 
     private static final Logger LOG = LoggerFactory.getLogger(GridLoaderServiceDefault.class);
@@ -222,13 +220,8 @@ public class GridLoaderServiceDefault implements GridLoaderService {
 
     // -- injected dependencies
 
-    @javax.inject.Inject
-    MessageService messageService;
-
-    @javax.inject.Inject
-    JaxbService jaxbService;
-
-    @javax.inject.Inject
-    List<GridSystemService<?>> gridSystemServices;
+    @Inject MessageService messageService;
+    @Inject JaxbService jaxbService;
+    @Inject @Any Instance<GridSystemService<?>> gridSystemServices;
 
 }
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 f2f4c93..44dbf9d 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
@@ -19,8 +19,11 @@ package org.apache.isis.core.metamodel.services.grid;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.applib.services.grid.GridLoaderService;
@@ -30,10 +33,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class GridServiceDefault implements GridService {
 
     //private static final Logger LOG = LoggerFactory.getLogger(GridServiceDefault.class);
@@ -142,7 +142,7 @@ public class GridServiceDefault implements GridService {
         parts.add(LINKS_TNS);
         parts.add(LINKS_SCHEMA_LOCATION);
 
-        for (GridSystemService<?> gridSystemService : gridSystemServices) {
+        for (GridSystemService<?> gridSystemService : getGridSystemServices()) {
             final Class<? extends Grid> gridImpl = gridSystemService.gridImplementation();
             if(gridImpl.isAssignableFrom(grid.getClass())) {
                 parts.add(gridSystemService.tns());
@@ -172,7 +172,7 @@ public class GridServiceDefault implements GridService {
         if (filteredGridSystemServices == null) {
             List<GridSystemService<?>> services = _Lists.newArrayList();
 
-            for (GridSystemService<?> gridSystemService : this.gridSystemServices) {
+            for (GridSystemService<?> gridSystemService : getGridSystemServices()) {
                 final Class<?> gridImplementation = gridSystemService.gridImplementation();
                 final boolean seenBefore = _NullSafe.stream(services)
                         .anyMatch((GridSystemService<?> systemService) -> 
@@ -188,14 +188,20 @@ public class GridServiceDefault implements GridService {
         return filteredGridSystemServices;
     }
 
+    // -- poor man's testing support
+    
+    List<GridSystemService<?>> gridSystemServicesForTest;
+    Iterable<GridSystemService<?>> getGridSystemServices() {
+        return gridSystemServices!=null 
+                ? gridSystemServices
+                        : gridSystemServicesForTest;
+    }
+    
     ////////////////////////////////////////////////////////
 
-
-
-    @javax.inject.Inject
-    GridLoaderService gridLoaderService;
-
-    @javax.inject.Inject
-    List<GridSystemService<?>> gridSystemServices;
+    @Inject GridLoaderService gridLoaderService;
+    @Inject @Any private Instance<GridSystemService<?>> gridSystemServices;
+    
+    
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index 0681bbd..6aac751 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -23,6 +23,8 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
+import javax.inject.Inject;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -691,16 +693,9 @@ public abstract class GridSystemServiceAbstract<G extends org.apache.isis.applib
 
     // //////////////////////////////////////
 
-    @javax.inject.Inject
-    protected SpecificationLoader specificationLoader;
-
-    @javax.inject.Inject
-    protected TranslationService translationService;
-
-    @javax.inject.Inject
-    protected JaxbService jaxbService;
-
-    @javax.inject.Inject
-    protected MessageService messageService;
+    @Inject protected SpecificationLoader specificationLoader;
+    @Inject protected TranslationService translationService;
+    @Inject protected JaxbService jaxbService;
+    @Inject protected MessageService messageService;
 
 }
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 2be41aa..d5e99a7 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
@@ -16,8 +16,6 @@
  */
 package org.apache.isis.core.metamodel.services.grid.bootstrap3;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -26,9 +24,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.layout.component.ActionLayoutData;
 import org.apache.isis.applib.layout.component.ActionLayoutDataOwner;
@@ -60,10 +58,9 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
+@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 4fc0f98..4773a70 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
@@ -25,11 +25,11 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 import javax.xml.bind.Marshaller;
 
 import org.apache.isis.applib.FatalException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.applib.layout.menubars.MenuBars;
@@ -45,10 +45,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class LayoutServiceDefault implements LayoutService2 {
 
     //private static final Logger LOG = LoggerFactory.getLogger(LayoutServiceDefault.class);
@@ -145,17 +142,9 @@ public class LayoutServiceDefault implements LayoutService2 {
                         ));
     }
 
-
-    @javax.inject.Inject
-    SpecificationLoader specificationLoader;
-
-    @javax.inject.Inject
-    JaxbService jaxbService;
-
-    @javax.inject.Inject
-    GridService gridService;
-
-    @javax.inject.Inject
-    MenuBarsService menuBarsService;
+    @Inject SpecificationLoader specificationLoader;
+    @Inject JaxbService jaxbService;
+    @Inject GridService gridService;
+    @Inject MenuBarsService menuBarsService;
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceNoop.java
index 934a1b3..a43063c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceNoop.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceNoop.java
@@ -18,16 +18,10 @@
  */
 package org.apache.isis.core.metamodel.services.message;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.message.MessageService;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
-public class MessageServiceNoop implements MessageService {
+public abstract class MessageServiceNoop implements MessageService {
 
     @Override
     public void informUser(final String message) {
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 bb54f4d..22a0572 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
@@ -21,20 +21,14 @@ package org.apache.isis.core.metamodel.services.metamodel;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.Map;
 
 import javax.annotation.PostConstruct;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 
 import org.apache.isis.applib.AppManifest;
 import org.apache.isis.applib.AppManifest2;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.command.CommandDtoProcessor;
@@ -42,6 +36,8 @@ import org.apache.isis.applib.services.grid.GridService;
 import org.apache.isis.applib.services.metamodel.DomainMember;
 import org.apache.isis.applib.services.metamodel.DomainModel;
 import org.apache.isis.applib.services.metamodel.MetaModelService;
+import org.apache.isis.commons.internal.base._Blackhole;
+import org.apache.isis.commons.internal.cdi._CDI;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.core.metamodel.JdoMetamodelUtil;
 import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
@@ -60,14 +56,10 @@ 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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-    )
+@Singleton
 public class MetaModelServiceDefault implements MetaModelService {
 
-    @SuppressWarnings("unused")
-    private final static Logger LOG = LoggerFactory.getLogger(MetaModelServiceDefault.class);
+    // private final static Logger LOG = LoggerFactory.getLogger(MetaModelServiceDefault.class);
 
     private MetaModelExporter metaModelExporter;
 
@@ -102,15 +94,19 @@ public class MetaModelServiceDefault implements MetaModelService {
     @Override
     public void rebuild(final Class<?> domainType) {
         specificationLookup.invalidateCache(domainType);
+        
+        GridService gridService = _CDI.getManagedBean(GridService.class).get();
         gridService.remove(domainType);
+        
         final ObjectSpecification objectSpecification = specificationLookup.loadSpecification(domainType);
-        //FIXME[ISIS-1976] the following might be optimized away by the JVM, since the results are not used
         
         // ensure the spec is fully rebuilt
         objectSpecification.streamObjectActions(Contributed.INCLUDED)
-            .collect(Collectors.toList());
+        .forEach(_Blackhole::consume);
+        
         objectSpecification.streamAssociations(Contributed.INCLUDED)
-            .collect(Collectors.toList());
+        .forEach(_Blackhole::consume);
+        
         specificationLookup.postProcess(objectSpecification);
     }
 
@@ -289,19 +285,15 @@ public class MetaModelServiceDefault implements MetaModelService {
         return appManifestProvider.getAppManifest();
     }
 
-    @javax.inject.Inject
-    SpecificationLoader specificationLookup;
-
-    @javax.inject.Inject
-    GridService gridService;
-
-    @javax.inject.Inject
-    AppManifestProvider appManifestProvider;
-
     @Override
     public MetamodelDto exportMetaModel(final Config config) {
         return metaModelExporter.exportMetaModel(config);
     }
+    
+    @Inject SpecificationLoader specificationLookup;
+    //@Inject GridService gridService; // to break circular dependency
+    @Inject AppManifestProvider appManifestProvider;
+
 
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
index 2d1abe8..e04d836 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
@@ -22,8 +22,6 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.Supplier;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
@@ -34,11 +32,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
-public class PersistenceSessionServiceInternalNoop implements PersistenceSessionServiceInternal {
+public abstract class PersistenceSessionServiceInternalNoop implements PersistenceSessionServiceInternal {
 
     @Override
     public ObjectAdapterProvider getObjectAdapterProvider() {
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 437345e..8234dc3 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
@@ -21,21 +21,18 @@ package org.apache.isis.core.metamodel.services.registry;
 
 import java.util.stream.Stream;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.enterprise.inject.Vetoed;
+import javax.inject.Inject;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.services.ServicesInjectorAware;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Vetoed
 public class ServiceRegistryDefault implements ServiceRegistry, ServicesInjectorAware {
 
-
     @Programmatic
     @Override
     public <T> T injectServicesInto(T domainObject) {
@@ -59,17 +56,12 @@ public class ServiceRegistryDefault implements ServiceRegistry, ServicesInjector
         return wrapperFactory != null ? wrapperFactory.unwrap(domainObject) : domainObject;
     }
 
-
-
-    @javax.inject.Inject
-    WrapperFactory wrapperFactory;
-
     private ServicesInjector servicesInjector;
     @Override
     public void setServicesInjector(final ServicesInjector servicesInjector) {
         this.servicesInjector = servicesInjector;
     }
 
-    
+    @Inject WrapperFactory wrapperFactory;    
 
 }
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 b0c6af6..8be0093 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
@@ -25,11 +25,10 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
 
 import org.apache.isis.applib.PersistFailedException;
 import org.apache.isis.applib.RepositoryException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.query.QueryFindAllInstances;
@@ -44,10 +43,7 @@ import org.apache.isis.core.metamodel.services.persistsession.PersistenceSession
 
 import static org.apache.isis.config.internal._Config.getConfiguration;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 a4254d8..22660f3 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
@@ -19,12 +19,9 @@
 package org.apache.isis.core.metamodel.services.swagger;
 
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.swagger.SwaggerService;
 import org.apache.isis.core.metamodel.services.swagger.internal.SwaggerSpecGenerator;
@@ -35,14 +32,10 @@ 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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class SwaggerServiceDefault implements SwaggerService {
 
-    @SuppressWarnings("unused")
-    private final static Logger LOG = LoggerFactory.getLogger(SwaggerServiceDefault.class);
+    // private final static Logger LOG = LoggerFactory.getLogger(SwaggerServiceDefault.class);
 
     private String basePath;
 
@@ -65,7 +58,6 @@ public class SwaggerServiceDefault implements SwaggerService {
         return swaggerSpec;
     }
 
-    @javax.inject.Inject
-    SpecificationLoader specificationLoader;
+    @Inject SpecificationLoader specificationLoader;
 
 }
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 83e6e68..c108083 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
@@ -19,8 +19,9 @@
 
 package org.apache.isis.core.metamodel.services.title;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
@@ -28,10 +29,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class TitleServiceDefault implements TitleService {
 
     @Programmatic
@@ -65,10 +63,7 @@ public class TitleServiceDefault implements TitleService {
         return sessionServiceInternal;
     }
     
-    @javax.inject.Inject
-    PersistenceSessionServiceInternal sessionServiceInternal;
-
-    @javax.inject.Inject
-    WrapperFactory wrapperFactory;
+    @Inject PersistenceSessionServiceInternal sessionServiceInternal;
+    @Inject WrapperFactory wrapperFactory;
 
 }
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 9ef09d2..9ecd9bb 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
@@ -19,66 +19,58 @@
 
 package org.apache.isis.core.metamodel.services.user;
 
-import java.util.List;
 import java.util.Set;
-import java.util.Stack;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.ejb.Singleton;
 import javax.inject.Inject;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.security.RoleMemento;
 import org.apache.isis.applib.security.UserMemento;
-import org.apache.isis.applib.services.sudo.SudoService;
 import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
 
 import static org.apache.isis.commons.internal.base._NullSafe.stream;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class UserServiceDefault implements UserService {
 
     @Programmatic
     @Override
     public UserMemento getUser() {
 
-        final UserAndRoleOverrides userAndRoleOverrides = currentOverridesIfAny();
-
-        if (userAndRoleOverrides != null) {
-
-            final String username = userAndRoleOverrides.user;
-
-            final Stream<String> roles;
-            if (userAndRoleOverrides.roles != null) {
-                roles = userAndRoleOverrides.streamRoles();
-            } else {
-                // preserve the roles if were not overridden
-                roles = streamPreviousRoles();
-            }
-
-            final List<RoleMemento> roleMementos = asRoleMementos(roles);
-            return new UserMemento(username, roleMementos);
-
-        } else {
+//        final UserAndRoleOverrides userAndRoleOverrides = currentOverridesIfAny();
+//
+//        if (userAndRoleOverrides != null) {
+//
+//            final String username = userAndRoleOverrides.user;
+//
+//            final Stream<String> roles;
+//            if (userAndRoleOverrides.roles != null) {
+//                roles = userAndRoleOverrides.streamRoles();
+//            } else {
+//                // preserve the roles if were not overridden
+//                roles = streamPreviousRoles();
+//            }
+//
+//            final List<RoleMemento> roleMementos = asRoleMementos(roles);
+//            return new UserMemento(username, roleMementos);
+//
+//        } else {
             final AuthenticationSession session =
                     authenticationSessionProvider.getAuthenticationSession();
             return session.createUserMemento();
-        }
-    }
-
-    private Stream<String> streamPreviousRoles() {
-        final AuthenticationSession session =
-                authenticationSessionProvider.getAuthenticationSession();
-        
-        return session.streamRoles();
+//        }
     }
+//
+//    private Stream<String> streamPreviousRoles() {
+//        final AuthenticationSession session =
+//                authenticationSessionProvider.getAuthenticationSession();
+//        
+//        return session.streamRoles();
+//    }
 
     public static class UserAndRoleOverrides {
         final String user;
@@ -102,76 +94,72 @@ public class UserServiceDefault implements UserService {
             return stream(roles);
         }
     }
-
-    private final ThreadLocal<Stack<UserAndRoleOverrides>> overrides =
-            new ThreadLocal<Stack<UserAndRoleOverrides>>() {
-        @Override protected Stack<UserAndRoleOverrides> initialValue() {
-            return new Stack<>();
-        }
-    };
-
-
-    private void overrideUserAndRoles(final String user, final Iterable<String> rolesIfAny) {
-        
-        final Stream<String> roles = rolesIfAny != null 
-                ? stream(rolesIfAny)
-                        : inheritRoles();
-        
-        this.overrides.get().push(new UserAndRoleOverrides(user, roles));
-    }
-
-    private void resetOverrides() {
-        this.overrides.get().pop();
-    }
-
-    /**
-     * Not API; for use by the implementation of sudo/runAs (see {@link SudoService} etc.
-     */
-    @Programmatic
-    public UserAndRoleOverrides currentOverridesIfAny() {
-        final Stack<UserAndRoleOverrides> userAndRoleOverrides = overrides.get();
-        return !userAndRoleOverrides.empty()
-                ? userAndRoleOverrides.peek()
-                        : null;
-    }
-
-    private Stream<String> inheritRoles() {
-        final UserAndRoleOverrides currentOverridesIfAny = currentOverridesIfAny();
-        return currentOverridesIfAny != null
-                ? currentOverridesIfAny.streamRoles()
-                        : authenticationSessionProvider.getAuthenticationSession().streamRoles();
-    }
-
-    private static List<RoleMemento> asRoleMementos(final Stream<String> roles) {
-        final List<RoleMemento> mementos = stream(roles)
-                .map(RoleMemento::new)
-                .collect(Collectors.toList());
-        
-        return mementos;
-    }
-
-
-    @DomainService(
-            nature = NatureOfService.DOMAIN,
-            menuOrder = "" + Integer.MAX_VALUE
-            )
-    public static class SudoServiceSpi implements SudoService.Spi {
-
-        @Override
-        public void runAs(final String username, final Iterable<String> roles) {
-            userServiceDefault.overrideUserAndRoles(username, roles);
-        }
-
-        @Override
-        public void releaseRunAs() {
-            userServiceDefault.resetOverrides();
-        }
-
-        @Inject
-        UserServiceDefault userServiceDefault;
-    }
-
-    @javax.inject.Inject
-    AuthenticationSessionProvider authenticationSessionProvider;
+//
+//    private final ThreadLocal<Stack<UserAndRoleOverrides>> overrides =
+//            new ThreadLocal<Stack<UserAndRoleOverrides>>() {
+//        @Override protected Stack<UserAndRoleOverrides> initialValue() {
+//            return new Stack<>();
+//        }
+//    };
+
+//
+//    private void overrideUserAndRoles(final String user, final Iterable<String> rolesIfAny) {
+//        
+//        final Stream<String> roles = rolesIfAny != null 
+//                ? stream(rolesIfAny)
+//                        : inheritRoles();
+//        
+//        this.overrides.get().push(new UserAndRoleOverrides(user, roles));
+//    }
+//
+//    private void resetOverrides() {
+//        this.overrides.get().pop();
+//    }
+
+//    /**
+//     * Not API; for use by the implementation of sudo/runAs (see {@link SudoService} etc.
+//     */
+//    @Programmatic
+//    public UserAndRoleOverrides currentOverridesIfAny() {
+//        final Stack<UserAndRoleOverrides> userAndRoleOverrides = overrides.get();
+//        return !userAndRoleOverrides.empty()
+//                ? userAndRoleOverrides.peek()
+//                        : null;
+//    }
+
+//    private Stream<String> inheritRoles() {
+//        final UserAndRoleOverrides currentOverridesIfAny = currentOverridesIfAny();
+//        return currentOverridesIfAny != null
+//                ? currentOverridesIfAny.streamRoles()
+//                        : authenticationSessionProvider.getAuthenticationSession().streamRoles();
+//        return authenticationSessionProvider.getAuthenticationSession().streamRoles();
+//    }
+//
+//    private static List<RoleMemento> asRoleMementos(final Stream<String> roles) {
+//        final List<RoleMemento> mementos = stream(roles)
+//                .map(RoleMemento::new)
+//                .collect(Collectors.toList());
+//        
+//        return mementos;
+//    }
+
+
+//    @Singleton
+//    public static class SudoServiceSpi implements SudoService.Spi {
+//
+//        @Override
+//        public void runAs(final String username, final Iterable<String> roles) {
+//            userServiceDefault.overrideUserAndRoles(username, roles);
+//        }
+//
+//        @Override
+//        public void releaseRunAs() {
+//            userServiceDefault.resetOverrides();
+//        }
+//
+//        @Inject UserServiceDefault userServiceDefault;
+//    }
+
+    @Inject AuthenticationSessionProvider authenticationSessionProvider;
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 82e667e..fc6edaa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -23,6 +23,8 @@ import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.ejb.Singleton;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,7 +35,6 @@ import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ClassUtil;
@@ -82,7 +83,8 @@ import org.apache.isis.schema.utils.CommonDtoUtils;
  * </p>
  *
  */
-public class SpecificationLoader implements ApplicationScopedComponent {
+@Singleton
+public class SpecificationLoader {
 
     private final static Logger LOG = LoggerFactory.getLogger(SpecificationLoader.class);
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
index 407e666..d359a18 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
@@ -19,10 +19,9 @@
 
 package org.apache.isis.core.metamodel.specloader.validator;
 
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 
-public interface MetaModelValidator extends ApplicationScopedComponent {
+public interface MetaModelValidator {
 
     void init(final SpecificationLoader specificationLoader);
     void shutdown();
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
index 1864463..6efa2a3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
@@ -18,11 +18,6 @@
  */
 package org.apache.isis.core.metamodel.services.grid;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.Arrays;
 import java.util.Map;
 
 import javax.xml.bind.Marshaller;
@@ -41,12 +36,15 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3Grid;
 import org.apache.isis.applib.layout.grid.bootstrap3.BS3Row;
 import org.apache.isis.applib.layout.grid.bootstrap3.BS3Tab;
 import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
-import org.apache.isis.applib.services.grid.GridSystemService;
 import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.core.metamodel.services.grid.bootstrap3.GridSystemServiceBS3;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
 public class BS3GridTest {
 
     private JaxbService jaxbService;
@@ -55,11 +53,10 @@ public class BS3GridTest {
 
     @Before
     public void setUp() throws Exception {
-        jaxbService = new JaxbService.Simple();
+        jaxbService = new JaxbService.Simple() {};
         gridServiceDefault = new GridServiceDefault();
         gridSystemServiceBS3 = new GridSystemServiceBS3();
-        gridServiceDefault.gridSystemServices = Arrays.<GridSystemService<?>>asList(
-                gridSystemServiceBS3);
+        gridServiceDefault.gridSystemServicesForTest = _Lists.of(gridSystemServiceBS3);
     }
 
     @After
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
index a196127..931fd36 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
@@ -35,7 +35,7 @@ public class BS3MenuBarsTest {
 
     @Before
     public void setUp() throws Exception {
-        jaxbService = new JaxbService.Simple();
+        jaxbService = new JaxbService.Simple() {};
     }
 
     @After
diff --git a/core/plugins/ioc-weld/pom.xml b/core/plugins/ioc-weld/pom.xml
new file mode 100644
index 0000000..47b3405
--- /dev/null
+++ b/core/plugins/ioc-weld/pom.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+         http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.isis.core</groupId>
+        <artifactId>isis</artifactId>
+    	<version>${revision}</version>
+    	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>isis-core-plugins-ioc-weld</artifactId>
+
+    <name>Apache Isis Plugin for Inversion-of-Control (Weld)</name>
+	<description>
+        Standalone Inversion-of-Control support using Weld-SE.
+    </description>
+
+    <properties>
+    
+    	<weld.version>3.0.5.Final</weld.version>
+    
+        <jar-plugin.automaticModuleName>org.apache.isis.plugins.ioc-weld</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/plugins/ioc-weld</git-plugin.propertiesDir>
+    </properties>
+
+    	<build>
+		<resources>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+	</build>
+
+	<dependencies>
+	
+		<!-- compile dependencies -->
+
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>isis-core-commons</artifactId>
+			<scope>compile</scope>
+		</dependency>
+        
+        <dependency>
+        	<groupId>org.jboss.weld.se</groupId>
+        	<artifactId>weld-se-shaded</artifactId>
+        	<version>${weld.version}</version>
+        </dependency>
+
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>flatten</id>
+			<activation>
+				<property>
+					<name>!skip.flatten</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>flatten-maven-plugin</artifactId>
+						<version>1.0.0</version>
+						<executions>
+							<execution>
+								<id>flatten</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>flatten</goal>
+								</goals>
+								<configuration>
+									<flattenMode>defaults</flattenMode>
+									<updatePomFile>true</updatePomFile>
+									<pomElements>
+										<name>resolve</name>
+										<description>resolve</description>
+										<dependencies>resolve</dependencies>
+									</pomElements>
+								</configuration>
+							</execution>
+							<execution>
+								<id>flatten.clean</id>
+								<phase>clean</phase>
+								<goals>
+									<goal>clean</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+	
+</project>
diff --git a/core/plugins/ioc-weld/src/main/java/org/apache/isis/core/plugins/ioc/weld/IocPluginUsingWeld.java b/core/plugins/ioc-weld/src/main/java/org/apache/isis/core/plugins/ioc/weld/IocPluginUsingWeld.java
new file mode 100644
index 0000000..9a397dd
--- /dev/null
+++ b/core/plugins/ioc-weld/src/main/java/org/apache/isis/core/plugins/ioc/weld/IocPluginUsingWeld.java
@@ -0,0 +1,38 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.core.plugins.ioc.weld;
+
+import java.util.stream.Stream;
+
+import javax.enterprise.inject.spi.CDIProvider;
+
+import org.apache.isis.core.plugins.ioc.IocPlugin;
+
+import lombok.val;
+
+/**
+ * @since 2.0.0-M2
+ */
+public final class IocPluginUsingWeld implements IocPlugin {
+
+    @Override
+    public CDIProvider getCDIProvider(Stream<Class<?>> discover) {
+        val container = WeldFactory.newContainer(discover);
+        return () -> container;
+    }
+
+}
diff --git a/core/plugins/ioc-weld/src/main/java/org/apache/isis/core/plugins/ioc/weld/WeldFactory.java b/core/plugins/ioc-weld/src/main/java/org/apache/isis/core/plugins/ioc/weld/WeldFactory.java
new file mode 100644
index 0000000..4dba7c2
--- /dev/null
+++ b/core/plugins/ioc-weld/src/main/java/org/apache/isis/core/plugins/ioc/weld/WeldFactory.java
@@ -0,0 +1,115 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.core.plugins.ioc.weld;
+
+import java.util.stream.Stream;
+
+import javax.annotation.Nullable;
+
+import org.jboss.weld.environment.se.Weld;
+import org.jboss.weld.environment.se.WeldContainer;
+
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.exceptions._Exceptions;
+
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
+/**
+ * @since 2.0.0-M2
+ */
+public class WeldFactory {
+    
+    public static int invokeCount = 0;
+
+	public static WeldContainer newContainer(@Nullable Stream<Class<?>> discover) {
+		return newContainer(null, discover);
+	}
+	
+	public static WeldContainer newContainer(@Nullable String containerId, @Nullable Stream<Class<?>> discover) {
+	    
+	    final Class<?>[] classes = stream(discover)
+	            .collect(_Arrays.toArray(Class.class));
+	    
+	    final Class<?> beanScanInterceptor = classForName("org.apache.isis.core.webapp.jee.IsisCDIBeanScanInterceptor");
+	    final Class<?>[] additionalPackages = 
+	            classesForClassNames(
+	                    
+	                    "domainapp.application.HelloWorldAppManifest",
+	                    "org.apache.isis.config.AppConfig",
+	                    "org.apache.isis.applib.AppManifest",
+	                    "org.apache.isis.core.runtime.RuntimeModule",
+	                    "org.apache.isis.core.metamodel.JdoMetamodelUtil",
+	                    "org.apache.isis.core.wrapper.WrapperFactoryDefault",
+	                    "org.apache.isis.viewer.wicket.viewer.IsisWicketModule",
+	                    "org.apache.isis.applib.services.jdosupport.IsisJdoSupportDN5",
+	                    
+	                    "org.apache.wicket.cdi.AutoConversation"
+	                    
+	                    );
+	    
+	    stream(classes)
+	    .forEach(p->System.out.println("!!! scanning c "+p));
+	    stream(additionalPackages)
+        .forEach(p->System.out.println("!!! scanning p "+p));
+	    
+        boolean scanRecursively = true;
+        
+        Weld builder = new Weld()
+	            .disableDiscovery()
+	            .addPackages(scanRecursively, classes)
+	            .addPackages(scanRecursively, additionalPackages)
+	            //.interceptors(beanScanInterceptor)
+	            .property("org.jboss.weld.construction.relaxed", true);
+        
+        if(!_Strings.isNullOrEmpty(containerId)) {
+            builder = builder.containerId(containerId);
+        }
+        
+        WeldContainer container = builder.initialize();
+        
+        return container;
+        
+	}
+	
+	private static Package[] packagesForClassNames(String ... names) {
+	    final Package[] packages = stream(names)
+	            .map(WeldFactory::classForName)
+	            .map(Class::getPackage)
+                .collect(_Arrays.toArray(Package.class));
+	    return packages;
+	}
+	
+	private static Class<?>[] classesForClassNames(String ... names) {
+        final Class<?>[] classes = stream(names)
+                .map(WeldFactory::classForName)
+                .collect(_Arrays.toArray(Class.class));
+        return classes;
+    }
+	
+	private static Class<?> classForName(String name) {
+        final Class<?> cls;
+        try {
+            cls = _Context.loadClassAndInitialize(name);
+        } catch (ClassNotFoundException e) {
+            throw _Exceptions.unrecoverable(e);
+        }
+        return cls;
+    }
+	
+}
diff --git a/core/plugins/ioc-weld/src/main/resources/META-INF/services/org.apache.isis.core.plugins.ioc.IocPlugin b/core/plugins/ioc-weld/src/main/resources/META-INF/services/org.apache.isis.core.plugins.ioc.IocPlugin
new file mode 100644
index 0000000..516bd15
--- /dev/null
+++ b/core/plugins/ioc-weld/src/main/resources/META-INF/services/org.apache.isis.core.plugins.ioc.IocPlugin
@@ -0,0 +1 @@
+org.apache.isis.core.plugins.ioc.weld.IocPluginUsingWeld
\ No newline at end of file
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 ed5f9b1..5a7bf0c 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
@@ -19,8 +19,6 @@
 
 package org.apache.isis.applib.services.jdosupport;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -31,6 +29,7 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
+import javax.ejb.Singleton;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.datastore.JDOConnection;
@@ -40,8 +39,6 @@ import org.datanucleus.query.typesafe.BooleanExpression;
 import org.datanucleus.query.typesafe.TypesafeQuery;
 
 import org.apache.isis.applib.FatalException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.collections._Maps;
@@ -52,6 +49,8 @@ import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
 
 /**
  * This service provdes a number of utility methods to supplement/support the capabilities of the JDO Objectstore.
@@ -61,10 +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.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class IsisJdoSupportDN4 implements IsisJdoSupport_v3_1 {
 
     @Programmatic
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
index 8edb20d..0bc14d7 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
@@ -18,8 +18,6 @@
  */
 package org.apache.isis.core.runtime.system.persistence;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -38,7 +36,6 @@ import org.datanucleus.store.schema.SchemaAwareStoreManager;
 
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.factory.InstanceUtil;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -49,7 +46,9 @@ import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPropertiesAware;
 import org.apache.isis.objectstore.jdo.metamodel.facets.object.query.JdoNamedQuery;
 import org.apache.isis.objectstore.jdo.metamodel.facets.object.query.JdoQueryFacet;
 
-public class DataNucleusApplicationComponents4 implements ApplicationScopedComponent {
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
+public class DataNucleusApplicationComponents4 {
 
     public static final String CLASS_METADATA_LOADED_LISTENER_KEY = "classMetadataLoadedListener";
     static final String CLASS_METADATA_LOADED_LISTENER_DEFAULT = CreateSchemaObjectFromClassMetadata4.class.getName();
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory4.java
index 1deae2d..40d57f5 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory4.java
@@ -34,7 +34,6 @@ import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
@@ -52,7 +51,7 @@ import org.apache.isis.objectstore.jdo.service.RegisterEntities;
  * </p>
  */
 public class PersistenceSessionFactory4 implements
-PersistenceSessionFactory, ApplicationScopedComponent, FixturesInstalledFlag {
+PersistenceSessionFactory, FixturesInstalledFlag {
 
     private static final Logger LOG = LoggerFactory.getLogger(PersistenceSessionFactory4.class);
 
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 6a24b03..749e083 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
@@ -16,8 +16,8 @@
  */
 package org.apache.isis.objectstore.jdo.datanucleus.service.eventbus;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.core.runtime.services.eventbus.EventBusServiceDefault;
 import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis;
@@ -39,10 +39,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.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "0" // initialize first, so available for any services that persist objects in their @PostConstruct
-        )
+@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 8cfefd9..19f9fcb 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
@@ -19,8 +19,6 @@
 
 package org.apache.isis.applib.services.jdosupport;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -31,6 +29,7 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
+import javax.ejb.Singleton;
 import javax.jdo.Extent;
 import javax.jdo.JDOQLTypedQuery;
 import javax.jdo.PersistenceManager;
@@ -38,8 +37,6 @@ import javax.jdo.datastore.JDOConnection;
 import javax.jdo.query.BooleanExpression;
 
 import org.apache.isis.applib.FatalException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.collections._Maps;
@@ -50,6 +47,8 @@ import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
 
 /**
  * This service provides a number of utility methods to supplement/support the capabilities of the JDO Objectstore.
@@ -59,10 +58,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.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
 
     @Programmatic
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
index 01859cb..5ebf8d3 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
@@ -35,7 +35,6 @@ import org.datanucleus.store.schema.SchemaAwareStoreManager;
 
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.factory.InstanceUtil;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -48,7 +47,7 @@ import org.apache.isis.objectstore.jdo.metamodel.facets.object.query.JdoQueryFac
 
 import static org.apache.isis.commons.internal.base._NullSafe.stream;
 
-public class DataNucleusApplicationComponents5 implements ApplicationScopedComponent {
+public class DataNucleusApplicationComponents5 {
 
     public static final String CLASS_METADATA_LOADED_LISTENER_KEY = "classMetadataLoadedListener";
     static final String CLASS_METADATA_LOADED_LISTENER_DEFAULT = CreateSchemaObjectFromClassMetadata.class.getName();
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
index 6c4d931..82d7e4e 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
@@ -34,7 +34,6 @@ import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
@@ -52,7 +51,7 @@ import org.apache.isis.objectstore.jdo.service.RegisterEntities;
  * </p>
  */
 public class PersistenceSessionFactory5
-implements PersistenceSessionFactory, ApplicationScopedComponent, FixturesInstalledFlag {
+implements PersistenceSessionFactory, FixturesInstalledFlag {
 
     private static final Logger LOG = LoggerFactory.getLogger(PersistenceSessionFactory5.class);
 
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 d7159c1..a9b3729 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
@@ -16,8 +16,8 @@
  */
 package org.apache.isis.objectstore.jdo.datanucleus.service.eventbus;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.core.runtime.services.eventbus.EventBusServiceDefault;
 import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis;
@@ -39,10 +39,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.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "0" // initialize first, so available for any services that persist objects in their @PostConstruct
-        )
+@Singleton
 public class EventBusServiceJdo extends EventBusServiceDefault {
 
     /**
diff --git a/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authentication/Pac4jAuthenticationManagerInstaller.java b/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authentication/Pac4jAuthenticationManagerInstaller.java
deleted file mode 100644
index 3a978c5..0000000
--- a/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authentication/Pac4jAuthenticationManagerInstaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.security.pac4j.authentication;
-
-import java.util.List;
-
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-
-public class Pac4jAuthenticationManagerInstaller 
-extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
-
-    public static String NAME = "pac4j";
-
-    public Pac4jAuthenticationManagerInstaller() {
-        super(NAME);
-    }
-
-    @Override
-    protected List<Authenticator> createAuthenticators() {
-        return _Lists.singleton(new Pac4jAuthenticator());
-    }
-}
diff --git a/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authentication/Pac4jAuthenticator.java b/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authentication/Pac4jAuthenticator.java
index bac47dd..90ad866 100644
--- a/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authentication/Pac4jAuthenticator.java
+++ b/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authentication/Pac4jAuthenticator.java
@@ -22,6 +22,7 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.security.authentication.AuthenticationRequest;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
 
 public class Pac4jAuthenticator implements Authenticator {
 
@@ -46,10 +47,9 @@ public class Pac4jAuthenticator implements Authenticator {
         
         System.out.println("!!! Pac4jAuthenticator.canAuthenticate authenticationRequestClass="+authenticationRequestClass);
         
-        
         _Exceptions.dumpStackTrace(System.out, 0, 1000);
         
-        return true;
+        return false;
     }
 
     @Override
@@ -57,8 +57,8 @@ public class Pac4jAuthenticator implements Authenticator {
         
         System.out.println("!!! Pac4jAuthenticator.authenticate request=" + request + ", code="+code);
         
-        // TODO Auto-generated method stub
-        return null;
+        String[] roles = {};
+        return new SimpleSession(request.getName(), roles, code);
     }
 
     @Override
@@ -68,5 +68,9 @@ public class Pac4jAuthenticator implements Authenticator {
         System.out.println("!!! Pac4jAuthenticator.logout session="+session);
 
     }
+    
+    // -- HELPER
+    
+
 
 }
diff --git a/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authorization/Pac4jAuthorizationManagerInstaller.java b/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authorization/Pac4jAuthorizationManagerInstaller.java
deleted file mode 100644
index 9115ca9..0000000
--- a/core/plugins/security-pac4j/src/main/java/org/apache/isis/security/pac4j/authorization/Pac4jAuthorizationManagerInstaller.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.security.pac4j.authorization;
-
-import org.apache.isis.core.security.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
-
-public class Pac4jAuthorizationManagerInstaller extends AuthorizationManagerStandardInstallerAbstract {
-
-    public static String NAME = "pac4j";
-
-    public Pac4jAuthorizationManagerInstaller() {
-        super(NAME);
-    }
-
-    @Override
-    protected Authorizor createAuthorizor() {
-        return new Pac4jAuthorizor();
-    }
-
-}
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroConstants.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroConstants.java
deleted file mode 100644
index 3322b32..0000000
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroConstants.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.security.shiro;
-
-import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerInstaller;
-import org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller;
-
-//not used
-final class ShiroConstants {
-
-    public static final String ROOT_AUTHENTICATION = ConfigurationConstants.ROOT + AuthenticationManagerInstaller.TYPE + "." + ShiroAuthenticationManagerInstaller.NAME + ".";
-
-    private ShiroConstants() {
-    }
-
-}
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java
deleted file mode 100644
index 7776af9..0000000
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticationManagerInstaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.security.shiro.authentication;
-
-import java.util.List;
-
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-
-public class ShiroAuthenticationManagerInstaller
-extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
-
-    public static String NAME = "shiro";
-
-    public ShiroAuthenticationManagerInstaller() {
-        super(NAME);
-    }
-
-    @Override
-    protected List<Authenticator> createAuthenticators() {
-        return _Lists.singleton(new ShiroAuthenticator());
-    }
-}
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 30042c0..88f661a 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
@@ -23,6 +23,8 @@ import java.util.Collections;
 import java.util.Set;
 import java.util.stream.Stream;
 
+import javax.ejb.Singleton;
+
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
@@ -46,10 +48,8 @@ import org.apache.isis.commons.internal.collections._Sets;
 import org.apache.isis.core.security.authentication.AuthenticationRequest;
 import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerInstaller;
 import org.apache.isis.core.security.authentication.standard.Authenticator;
 import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManagerInstaller;
 import org.apache.isis.core.security.authorization.standard.Authorizor;
 import org.apache.isis.security.shiro.ShiroSecurityContext;
 
@@ -65,6 +65,7 @@ import static org.apache.isis.config.internal._Config.getConfiguration;
  * {@link SecurityManager Shiro SecurityManager}
  * (bound to a thread-local).
  */
+@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/ShiroAuthorizationManagerInstaller.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizationManagerInstaller.java
deleted file mode 100644
index 2a12449..0000000
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizationManagerInstaller.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.security.shiro.authorization;
-
-import org.apache.isis.core.security.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
-
-public class ShiroAuthorizationManagerInstaller extends AuthorizationManagerStandardInstallerAbstract {
-
-    public static String NAME = "shiro";
-
-    public ShiroAuthorizationManagerInstaller() {
-        super(NAME);
-    }
-
-    @Override
-    protected Authorizor createAuthorizor() {
-        return new ShiroAuthorizor();
-    }
-
-}
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 783df9c..a67dc1f 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
@@ -18,15 +18,15 @@
  */
 package org.apache.isis.security.shiro.authorization;
 
+import javax.ejb.Singleton;
+
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.mgt.RealmSecurityManager;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.subject.Subject;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerInstaller;
 import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManagerInstaller;
 import org.apache.isis.core.security.authorization.standard.Authorizor;
 import org.apache.isis.security.shiro.ShiroSecurityContext;
 
@@ -39,6 +39,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
 public class ShiroAuthorizor implements Authorizor {
 
     //private static final Logger LOG = LoggerFactory.getLogger(ShiroAuthorizor.class);
diff --git a/core/pom.xml b/core/pom.xml
index 36c385a..1c59ee8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -171,11 +171,10 @@
         <select2.version>4.0.5</select2.version>
 
         <jquery-ui.version>1.12.1</jquery-ui.version>
-
         
         <picocontainer.version>2.15</picocontainer.version>
         
-        <javaee.version>7.0</javaee.version>
+        <javaee.version>8.0</javaee.version>
 
         <htmlparser.version>2.1</htmlparser.version>
 
@@ -1367,6 +1366,12 @@ ${license.additional-notes}
             
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
+                <artifactId>isis-core-plugins-ioc-weld</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-plugins-security-pac4j</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -1732,30 +1737,19 @@ ${license.additional-notes}
 
             <dependency>
                 <groupId>org.apache.wicket</groupId>
-                <artifactId>wicket-auth-roles</artifactId>
+                <artifactId>wicket-cdi</artifactId>
                 <version>${wicket.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.wicket</groupId>
-                <artifactId>wicket-guice</artifactId>
+                <artifactId>wicket-auth-roles</artifactId>
                 <version>${wicket.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
                         <artifactId>slf4j-api</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <!-- for Java7 compatibility (we don't use the proxying capability of this component) -->
-                        <groupId>cglib</groupId>
-                        <artifactId>cglib</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -2487,6 +2481,7 @@ ${license.additional-notes}
         <module>plugins/discovery-reflections</module>
         <module>plugins/eventbus-axon</module>
         <module>plugins/eventbus-guava</module>
+        <module>plugins/ioc-weld</module>
         <module>plugins/jaxrs-resteasy-3</module>
         <module>plugins/jaxrs-resteasy-4</module>
         <module>plugins/jdo-datanucleus-4</module>
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 07887e1..6a58505 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
@@ -18,16 +18,12 @@
  */
 package org.apache.isis.applib.services.exceprecog.jdo;
 
-import java.util.Map;
-
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
-import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.config.internal._Config;
 
 /**
@@ -41,10 +37,7 @@ import org.apache.isis.config.internal._Config;
  *     the first one found).
  * </p>
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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/RuntimeModule.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeModule.java
new file mode 100644
index 0000000..6a0309d
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeModule.java
@@ -0,0 +1,5 @@
+package org.apache.isis.core.runtime;
+
+public final class RuntimeModule {
+
+}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
deleted file mode 100644
index fb9ed27..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.installerregistry.installerapi;
-
-import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-
-/**
- * Installs a {@link PersistenceSession} during system start up.
- */
-public interface PersistenceMechanismInstaller extends Installer {
-
-    static String TYPE = "persistor";
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
deleted file mode 100644
index fe058d6..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.runner.opts;
-
-import static org.apache.isis.core.runtime.runner.Constants.PASSWORD_LONG_OPT;
-import static org.apache.isis.core.runtime.runner.Constants.PASSWORD_OPT;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import org.apache.isis.config.builder.IsisConfigurationBuilder;
-import org.apache.isis.core.runtime.optionhandler.BootPrinter;
-import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
-import org.apache.isis.core.runtime.runner.Constants;
-import org.apache.isis.core.runtime.system.SystemConstants;
-
-public class OptionHandlerPassword extends OptionHandlerAbstract {
-
-    private String password;
-
-    public OptionHandlerPassword() {
-        super();
-    }
-
-    @Override
-    @SuppressWarnings("static-access")
-    public void addOption(final Options options) {
-        final Option option = OptionBuilder.withArgName("password").hasArg().withLongOpt(PASSWORD_LONG_OPT).withDescription("password to automatically log in with").create(PASSWORD_OPT);
-        options.addOption(option);
-    }
-
-    @Override
-    public boolean handle(final CommandLine commandLine, final BootPrinter bootPrinter, final Options options) {
-        password = commandLine.getOptionValue(Constants.PASSWORD_OPT);
-        return true;
-    }
-
-    @Override
-    public void prime(final IsisConfigurationBuilder isisConfigurationBuilder) {
-        isisConfigurationBuilder.add(SystemConstants.PASSWORD_KEY, password);
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
deleted file mode 100644
index 02c6eab..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.runner.opts;
-
-import static org.apache.isis.core.runtime.runner.Constants.USER_LONG_OPT;
-import static org.apache.isis.core.runtime.runner.Constants.USER_OPT;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import org.apache.isis.config.builder.IsisConfigurationBuilder;
-import org.apache.isis.core.runtime.optionhandler.BootPrinter;
-import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
-import org.apache.isis.core.runtime.runner.Constants;
-import org.apache.isis.core.runtime.system.SystemConstants;
-
-public class OptionHandlerUser extends OptionHandlerAbstract {
-
-    private String userName;
-
-    public OptionHandlerUser() {
-        super();
-    }
-
-    @Override
-    @SuppressWarnings("static-access")
-    public void addOption(final Options options) {
-        final Option option = OptionBuilder.withArgName("user name").hasArg().withLongOpt(USER_LONG_OPT).withDescription("user name to log in with").create(USER_OPT);
-        options.addOption(option);
-
-    }
-
-    @Override
-    public boolean handle(final CommandLine commandLine, final BootPrinter bootPrinter, final Options options) {
-        userName = commandLine.getOptionValue(Constants.USER_OPT);
-        return true;
-    }
-
-    @Override
-    public void prime(final IsisConfigurationBuilder isisConfigurationBuilder) {
-        isisConfigurationBuilder.add(SystemConstants.USER_KEY, userName);
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
deleted file mode 100644
index 0ca08bb..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.services;
-
-import java.util.List;
-
-import org.apache.isis.core.commons.components.Installer;
-
-public interface ServicesInstaller extends Installer {
-
-    void init();
-
-    /**
-     * NB: this has the suffix '-installer' because in the command line we must
-     * distinguish from the '--services' flag meaning a particular set of
-     * services to use (whereas this flag means how to locate them).
-     */
-    String TYPE = "services-installer";
-
-    List<Object> getServices();
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
deleted file mode 100644
index 10b448f..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.services;
-
-import org.apache.isis.core.commons.components.InstallerAbstract;
-
-public abstract class ServicesInstallerAbstract extends InstallerAbstract implements ServicesInstaller {
-
-    public ServicesInstallerAbstract(final String name) {
-        super(name);
-    }
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
deleted file mode 100644
index b2bb03b..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.services;
-
-import java.lang.reflect.Modifier;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.function.Predicate;
-
-import javax.annotation.PreDestroy;
-
-import org.apache.isis.applib.AppManifest;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceMenuOrder;
-import org.apache.isis.core.metamodel.util.DeweyOrderComparator;
-
-import static org.apache.isis.commons.internal.base._With.requires;
-
-public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
-
-    //private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromAnnotation.class);
-
-    public static final String NAME = "annotation";
-    
-    private final ServiceInstantiator serviceInstantiator;
-
-    public ServicesInstallerFromAnnotation() {
-        this(new ServiceInstantiator());
-    }
-
-    public ServicesInstallerFromAnnotation(final ServiceInstantiator serviceInstantiator) {
-        super(NAME);
-        this.serviceInstantiator = serviceInstantiator;
-    }
-
-
-    // -- init, shutdown
-
-    @Override
-    public void init() {
-    }
-
-    @Override
-    @PreDestroy
-    public void shutdown() {
-    }
-
-    // -- HELPERS
-
-    private Predicate<Class<?>> instantiatable() {
-        return (final Class<?> input) -> 
-            input != null && !Modifier.isAbstract(input.getModifiers());
-    }
-
-    // -- getServices (API)
-
-    private List<Object> services;
-
-    @Override
-    public List<Object> getServices() {
-
-        if(this.services == null) {
-
-            final SortedMap<String, SortedSet<String>> positionedServices = _Maps.newTreeMap(new DeweyOrderComparator());
-            appendServices(positionedServices);
-
-            this.services = ServicesInstallerUtils.instantiateServicesFrom(positionedServices, serviceInstantiator);
-            
-        }
-        return services;
-    }
-
-
-    // -- appendServices
-
-    public void appendServices(final SortedMap<String, SortedSet<String>> positionedServices) {
-
-        Set<Class<?>> domainServiceTypes = AppManifest.Registry.instance().getDomainServiceTypes();
-        requires(domainServiceTypes, "domainServiceTypes");
-
-        final List<Class<?>> domainServiceClasses = _Lists.filter(domainServiceTypes, instantiatable());
-        for (final Class<?> cls : domainServiceClasses) {
-
-            final String order = DomainServiceMenuOrder.orderOf(cls);
-            // we want the class name in order to instantiate it
-            // (and *not* the value of the @DomainServiceLayout(named=...) annotation attribute)
-            final String fullyQualifiedClassName = cls.getName();
-
-            ServicesInstallerUtils.appendInPosition(positionedServices, order, fullyQualifiedClassName);
-        }
-    }
-
-    // -- domain events
-    public static abstract class PropertyDomainEvent<T>
-    extends org.apache.isis.applib.events.domain.PropertyDomainEvent<ServicesInstallerFromAnnotation, T> {
-        private static final long serialVersionUID = 1L;
-    }
-
-    public static abstract class CollectionDomainEvent<T>
-    extends org.apache.isis.applib.events.domain.CollectionDomainEvent<ServicesInstallerFromAnnotation, T> {
-        private static final long serialVersionUID = 1L;
-    }
-
-    public static abstract class ActionDomainEvent
-    extends org.apache.isis.applib.events.domain.ActionDomainEvent<ServicesInstallerFromAnnotation> {
-        private static final long serialVersionUID = 1L;
-    }
-
-
-    // -- getTypes (API)
-
-    @Override
-    public List<Class<?>> getTypes() {
-        return listOf(List.class); // ie List<Object.class>, of services
-    }
-
-
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
deleted file mode 100644
index 9e7034b..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.services;
-
-import java.util.List;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.metamodel.util.DeweyOrderComparator;
-
-public class ServicesInstallerFromConfiguration extends ServicesInstallerAbstract  {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromConfiguration.class);
-
-    public static final String NAME = "configuration";
-
-    private static final String SERVICES = "services";
-    public static final String SERVICES_KEY = ConfigurationConstants.ROOT + SERVICES;
-
-    private final static Pattern POSITIONED_SERVICE_REGEX = Pattern.compile("((\\d+):)(.*)");
-
-    private final ServiceInstantiator serviceInstantiator;
-
-    public ServicesInstallerFromConfiguration() {
-        this(new ServiceInstantiator());
-    }
-
-    ServicesInstallerFromConfiguration(final ServiceInstantiator serviceInstantiator) {
-        super(NAME);
-        this.serviceInstantiator = serviceInstantiator;
-    }
-
-    // //////////////////////////////////////
-
-    @Override
-    public void init() {
-        // nothing to do
-    }
-
-    // //////////////////////////////////////
-
-    private List<Object> serviceList;
-
-    @Override
-    public List<Object> getServices() {
-        LOG.info("installing {}", this.getClass().getName());
-
-        if(serviceList == null) {
-
-            final SortedMap<String, SortedSet<String>> positionedServices = _Maps.newTreeMap(new DeweyOrderComparator());
-            appendServices(positionedServices);
-
-            serviceList = ServicesInstallerUtils.instantiateServicesFrom(positionedServices, serviceInstantiator);
-        }
-        return serviceList;
-
-    }
-
-    // //////////////////////////////////////
-
-    void appendServices(
-            final SortedMap<String, SortedSet<String>> positionedServices) {
-
-        appendConfiguredServices(positionedServices);
-    }
-
-    private void appendConfiguredServices(
-            final SortedMap<String, SortedSet<String>> positionedServices) {
-
-        final String configuredServices = _Config.getConfiguration().getString(SERVICES_KEY);
-        if (configuredServices == null) {
-            return;
-        }
-
-        final StringTokenizer services = new StringTokenizer(configuredServices, ConfigurationConstants.LIST_SEPARATOR);
-        while (services.hasMoreTokens()) {
-            String serviceName = services.nextToken().trim();
-            if (serviceName.equals("")) {
-                continue;
-            }
-            final Matcher matcher = POSITIONED_SERVICE_REGEX.matcher(serviceName);
-            Integer order = Integer.MAX_VALUE;
-            if(matcher.matches()) {
-                order = Integer.parseInt(matcher.group(2));
-                serviceName = matcher.group(3);
-            }
-
-            ServicesInstallerUtils.appendInPosition(positionedServices, "" + order, serviceName);
-        }
-    }
-
-    @Override
-    public List<Class<?>> getTypes() {
-        return listOf(List.class); // ie List<Object.class>, of services
-    }
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java
deleted file mode 100644
index c017ce4..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.services;
-
-import java.util.List;
-import java.util.SortedMap;
-import java.util.SortedSet;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.metamodel.util.DeweyOrderComparator;
-
-public class ServicesInstallerFromConfigurationAndAnnotation extends ServicesInstallerAbstract  {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromConfigurationAndAnnotation.class);
-
-    public static final String NAME = "configuration-and-annotation";
-
-    private final ServiceInstantiator serviceInstantiator;
-    private final ServicesInstallerFromConfiguration servicesInstallerFromConfiguration;
-    private final ServicesInstallerFromAnnotation servicesInstallerFromAnnotation;
-
-
-    public ServicesInstallerFromConfigurationAndAnnotation() {
-        this(new ServiceInstantiator());
-    }
-
-    public ServicesInstallerFromConfigurationAndAnnotation(
-            final ServiceInstantiator serviceInstantiator) {
-        super(NAME);
-
-        this.serviceInstantiator = serviceInstantiator;
-        servicesInstallerFromConfiguration = new ServicesInstallerFromConfiguration(serviceInstantiator);
-        servicesInstallerFromAnnotation = new ServicesInstallerFromAnnotation(serviceInstantiator);
-    }
-
-
-    @Override
-    public void init() {
-        servicesInstallerFromConfiguration.init();
-        servicesInstallerFromAnnotation.init();
-    }
-
-    @Override
-    public void shutdown() {
-        servicesInstallerFromConfiguration.shutdown();
-        servicesInstallerFromAnnotation.shutdown();
-    }
-
-    // //////////////////////////////////////
-
-    private List<Object> serviceList;
-
-    @Override
-    public List<Object> getServices() {
-        LOG.info("installing {}", this.getClass().getName());
-
-        if(serviceList == null) {
-
-            final SortedMap<String,SortedSet<String>> positionedServices = _Maps.newTreeMap(new DeweyOrderComparator());
-            servicesInstallerFromConfiguration.appendServices(positionedServices);
-            servicesInstallerFromAnnotation.appendServices(positionedServices);
-
-            serviceList = ServicesInstallerUtils.instantiateServicesFrom(positionedServices, serviceInstantiator);
-        }
-
-        return serviceList;
-    }
-
-    // //////////////////////////////////////
-
-    @Override
-    public List<Class<?>> getTypes() {
-        return listOf(List.class); // ie List<Object.class>, of services
-    }
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
deleted file mode 100644
index 13e0031..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.services;
-
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Sets;
-
-final class ServicesInstallerUtils  {
-
-    //private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromConfiguration.class);
-
-    private static final char DELIMITER = '#';
-
-    private ServicesInstallerUtils (){}
-
-    static <V extends Comparable<V>> LinkedHashSet<V> flatten(SortedMap<String, SortedSet<V>> positionedServices) {
-        final LinkedHashSet<V> serviceList = _Sets.newLinkedHashSet();
-        final Set<String> keys = positionedServices.keySet();
-        for (String position : keys) {
-            final SortedSet<V> list = positionedServices.get(position);
-            serviceList.addAll(list);
-        }
-        return serviceList;
-    }
-
-    static <V> void appendInPosition(SortedMap<String, SortedSet<String>> positionedServices, String position, String service) {
-        if(service == null) {
-            return;
-        }
-        SortedSet<String> serviceList = positionedServices.get(position);
-        if(serviceList == null) {
-            serviceList = _Sets.newTreeSet();
-            positionedServices.put(position, serviceList);
-        }
-        serviceList.add(service);
-    }
-
-    static Object instantiateService(String serviceName, ServiceInstantiator serviceInstantiator) {
-        final int pos = serviceName.indexOf(DELIMITER);
-        if( pos == 0) {
-            // a commented out line, in other words...
-            return null;
-        }
-
-        final String type;
-        if (pos != -1) {
-            type = serviceName.substring(0, pos);
-            // disregard, assume the stuff after the delimiter (#) was a comment
-        } else {
-            type = serviceName;
-        }
-
-        return serviceInstantiator.createInstance(type);
-    }
-
-    static List<Object> instantiateServicesFrom(SortedMap<String, SortedSet<String>> positionedServices, final ServiceInstantiator serviceInstantiator) {
-        final LinkedHashSet<String> serviceNameList = flatten(positionedServices);
-
-        return _NullSafe.stream(serviceNameList)
-        .map(instantiator(serviceInstantiator))
-        .filter(_NullSafe::isPresent)
-        .collect(Collectors.toList());
-    }
-
-    private static Function<String, Object> instantiator(final ServiceInstantiator serviceInstantiator) {
-        return (String serviceName) -> instantiateService(serviceName, serviceInstantiator);
-    }
-
-}
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 7e32a92..4112bb6 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
@@ -18,13 +18,15 @@
  */
 package org.apache.isis.core.runtime.services.auditing;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.audit.AuditerService;
 import org.apache.isis.applib.services.bookmark.Bookmark;
@@ -43,10 +45,7 @@ import org.apache.isis.core.runtime.services.changes.PreAndPostValues;
 /**
  * Wrapper around {@link org.apache.isis.applib.services.audit.AuditerService}.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class AuditingServiceInternal {
 
     Boolean whetherCanAudit;
@@ -118,22 +117,11 @@ public class AuditingServiceInternal {
         }
     }
 
-    @javax.inject.Inject
-    List<AuditerService> auditerServices;
-
-    @javax.inject.Inject
-    ChangedObjectsServiceInternal changedObjectsServiceInternal;
-
-    @javax.inject.Inject
-    UserService userService;
-
-    @javax.inject.Inject
-    ClockService clockService;
-
-    @javax.inject.Inject
-    InteractionContext interactionContext;
-
-    @javax.inject.Inject
-    TransactionService transactionService;
+    @Inject @Any Instance<AuditerService> auditerServices;
+    @Inject ChangedObjectsServiceInternal changedObjectsServiceInternal;
+    @Inject UserService userService;
+    @Inject ClockService clockService;
+    @Inject InteractionContext interactionContext;
+    @Inject TransactionService transactionService;
 
 }
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 555f580..902a7df 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
@@ -16,10 +16,9 @@
  */
 package org.apache.isis.core.runtime.services.authsess;
 
-import java.util.stream.Stream;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@@ -27,10 +26,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class AuthenticationSessionProviderDefault implements AuthenticationSessionProvider {
 
     /**
@@ -44,24 +40,23 @@ public class AuthenticationSessionProviderDefault implements AuthenticationSessi
     @Override
     public AuthenticationSession getAuthenticationSession() {
 
-        // if user/role has been overridden by SudoService, then honour that value.
-        final UserServiceDefault.UserAndRoleOverrides userAndRoleOverrides =
-                userServiceDefault.currentOverridesIfAny();
-
-        if(userAndRoleOverrides != null) {
-            final String user = userAndRoleOverrides.getUser();
-            final Stream<String> roles = userAndRoleOverrides.streamRoles();
-            return new SimpleSession(user, roles);
-        }
+//        // if user/role has been overridden by SudoService, then honour that value.
+//        final UserServiceDefault.UserAndRoleOverrides userAndRoleOverrides =
+//                userServiceDefault.currentOverridesIfAny();
+//
+//        if(userAndRoleOverrides != null) {
+//            final String user = userAndRoleOverrides.getUser();
+//            final Stream<String> roles = userAndRoleOverrides.streamRoles();
+//            return new SimpleSession(user, roles);
+//        }
 
         // otherwise...
         return isisSessionFactory.getCurrentSession().getAuthenticationSession();
     }
 
-    @javax.inject.Inject
-    UserServiceDefault  userServiceDefault;
+//    @javax.inject.Inject
+//    UserServiceDefault userServiceDefault;
 
-    @javax.inject.Inject
-    IsisSessionFactory isisSessionFactory;
+    @Inject IsisSessionFactory isisSessionFactory;
 
 }
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 ed6d905..b5e7417 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
@@ -16,27 +16,27 @@
  */
 package org.apache.isis.core.runtime.services.background;
 
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
 import java.lang.reflect.InvocationHandler;
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import javax.ejb.Singleton;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.background.BackgroundCommandService;
 import org.apache.isis.applib.services.background.BackgroundService;
 import org.apache.isis.applib.services.command.CommandContext;
 import org.apache.isis.applib.services.factory.FactoryService;
 import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.core.commons.lang.ArrayExtensions;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
 import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
@@ -46,15 +46,14 @@ import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
 import org.apache.isis.core.plugins.codegen.ProxyFactory;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
 /**
  * For command-reification depends on an implementation of
  * {@link org.apache.isis.applib.services.background.BackgroundCommandService} to
  * be configured.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class BackgroundServiceDefault implements BackgroundService {
 
     static final Logger LOG = LoggerFactory.getLogger(BackgroundServiceDefault.class);
@@ -88,7 +87,7 @@ public class BackgroundServiceDefault implements BackgroundService {
     private BuiltinExecutor builtinExecutor; // only used if there is no BackgroundCommandService
 
     private boolean usesBuiltinExecutor() {
-        return backgroundCommandService==null;
+        return backgroundCommandServices.isUnsatisfied();
     }
 
     @Programmatic
@@ -166,7 +165,7 @@ public class BackgroundServiceDefault implements BackgroundService {
         }
 
         return new CommandInvocationHandler<T>(
-                backgroundCommandService,
+                backgroundCommandServices.get(),
                 target,
                 mixedInIfAny,
                 specificationLoader,
@@ -179,23 +178,12 @@ public class BackgroundServiceDefault implements BackgroundService {
 
     // //////////////////////////////////////
 
-    @javax.inject.Inject
-    private BackgroundCommandService backgroundCommandService;
-
-    @javax.inject.Inject
-    private CommandDtoServiceInternal commandDtoServiceInternal;
-
-    @javax.inject.Inject
-    private CommandContext commandContext;
-
-    @javax.inject.Inject
-    private FactoryService factoryService;
-
-    @javax.inject.Inject
-    private SpecificationLoader specificationLoader;
-
-    @javax.inject.Inject
-    private IsisSessionFactory isisSessionFactory;
+    @Inject @Any private Instance<BackgroundCommandService> backgroundCommandServices;
+    @Inject private CommandDtoServiceInternal commandDtoServiceInternal;
+    @Inject private CommandContext commandContext;
+    @Inject private FactoryService factoryService;
+    @Inject private SpecificationLoader specificationLoader;
+    @Inject private IsisSessionFactory isisSessionFactory;
 
     protected ObjectAdapterProvider getObjectAdapterProvider() {
         return isisSessionFactory.getCurrentSession().getPersistenceSession();
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 c426cc4..c0b0884 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
@@ -22,11 +22,12 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.ejb.Singleton;
+import javax.inject.Inject;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
@@ -71,7 +72,7 @@ import org.apache.isis.schema.common.v1.ValueWithTypeDto;
 import org.apache.isis.schema.utils.CommandDtoUtils;
 import org.apache.isis.schema.utils.CommonDtoUtils;
 
-@DomainService(nature = NatureOfService.DOMAIN)
+@Singleton
 public class CommandExecutorServiceDefault implements CommandExecutorService {
 
     private final static Logger LOG = LoggerFactory.getLogger(CommandExecutorServiceDefault.class);
@@ -374,22 +375,11 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
 
     // //////////////////////////////////////
 
-    @javax.inject.Inject
-    BookmarkService bookmarkService;
-
-    @javax.inject.Inject
-    InteractionContext interactionContext;
-
-    @javax.inject.Inject
-    SudoService sudoService;
-
-    @javax.inject.Inject
-    ClockService clockService;
-
-    @javax.inject.Inject
-    TransactionService transactionService;
-
-    @javax.inject.Inject
-    CommandContext commandContext;
+    @Inject BookmarkService bookmarkService;
+    @Inject InteractionContext interactionContext;
+    @Inject SudoService sudoService;
+    @Inject ClockService clockService;
+    @Inject TransactionService transactionService;
+    @Inject CommandContext commandContext;
 
 }
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
index fbcb476..0723efa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
@@ -27,8 +27,6 @@ import java.util.stream.Stream;
 
 import javax.enterprise.context.RequestScoped;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.PublishingChangeKind;
 import org.apache.isis.applib.services.HasUniqueId;
@@ -42,10 +40,6 @@ import org.apache.isis.core.metamodel.spec.feature.Contributed;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
 @RequestScoped
 public class ChangedObjectsServiceInternal implements WithTransactionScope {
 
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 0f394ed..5e8e24a 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
@@ -20,9 +20,8 @@ import java.util.List;
 import java.util.UUID;
 
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
@@ -50,10 +49,7 @@ import org.apache.isis.schema.common.v1.ValueWithTypeDto;
 import org.apache.isis.schema.utils.CommandDtoUtils;
 import org.apache.isis.schema.utils.CommonDtoUtils;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 c5c4445..0d44842 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
@@ -16,17 +16,14 @@
  */
 package org.apache.isis.core.runtime.services.command;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.annotation.Programmatic;
 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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 852cdf8..d39b2d0 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
@@ -24,6 +24,8 @@ import java.util.Properties;
 
 import javax.activation.DataSource;
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 
 import org.apache.commons.mail.DefaultAuthenticator;
 import org.apache.commons.mail.EmailException;
@@ -32,8 +34,6 @@ import org.apache.commons.mail.resolver.DataSourceClassPathResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.email.EmailService;
 import org.apache.isis.commons.internal.base._Strings;
@@ -42,10 +42,7 @@ import org.apache.isis.config.IsisConfiguration;
 /**
  * A service that sends email notifications when specific events occur
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class EmailServiceDefault implements EmailService {
 
     private static final long serialVersionUID = 1L;
@@ -273,7 +270,6 @@ public class EmailServiceDefault implements EmailService {
     }
     // endregion
 
-    @javax.inject.Inject
-    IsisConfiguration configuration;
+    @Inject IsisConfiguration configuration;
 
 }
\ No newline at end of file
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 f2f0a2e..0e4713e 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
@@ -21,11 +21,11 @@ package org.apache.isis.core.runtime.services.homepage;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import javax.ejb.Singleton;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.homepage.HomePageProviderService;
@@ -41,10 +41,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class HomePageProviderServiceDefault implements HomePageProviderService {
 
     @SuppressWarnings("unused")
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 52919a1..ae0f215 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
@@ -20,12 +20,11 @@ package org.apache.isis.core.runtime.services.i18n.po;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import javax.ejb.Singleton;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.i18n.LocaleProvider;
 import org.apache.isis.applib.services.i18n.TranslationService;
@@ -34,10 +33,7 @@ import org.apache.isis.commons.internal.context._Context;
 
 import static org.apache.isis.config.internal._Config.getConfiguration;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 85a6bee..943fc7a 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
@@ -21,8 +21,8 @@ package org.apache.isis.core.runtime.services.ixn;
 
 import java.util.List;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
@@ -44,10 +44,7 @@ import org.apache.isis.schema.ixn.v1.PropertyEditDto;
 import org.apache.isis.schema.utils.CommandDtoUtils;
 import org.apache.isis.schema.utils.InteractionDtoUtils;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 c632f71..32069f2 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
@@ -20,12 +20,12 @@ package org.apache.isis.core.runtime.services.menubars;
 
 import java.nio.charset.StandardCharsets;
 
+import javax.ejb.Singleton;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.isis.applib.AppManifest;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBars;
 import org.apache.isis.applib.services.jaxb.JaxbService;
 import org.apache.isis.applib.services.menu.MenuBarsLoaderService;
@@ -35,7 +35,7 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 
 import static org.apache.isis.commons.internal.resources._Resources.loadAsString;
 
-@DomainService(nature = NatureOfService.DOMAIN)
+@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 0666c0a..71e40b2 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
@@ -26,12 +26,12 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.ejb.Singleton;
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.DomainServiceLayout;
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
@@ -63,7 +63,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;
 
-@DomainService(nature = NatureOfService.DOMAIN)
+@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 c5ff488..f2b2989 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
@@ -18,19 +18,16 @@
  */
 package org.apache.isis.core.runtime.services.message;
 
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.RecoverableException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
 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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + (Integer.MAX_VALUE - 1)  // ie before the Noop impl in metamodel
-        )
+@Singleton
 public class MessageServiceDefault implements MessageService {
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
index 3fbdef7..c16ad02 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
@@ -25,18 +25,12 @@ import javax.jdo.listener.InstanceLifecycleEvent;
 import javax.jdo.listener.InstanceLifecycleListener;
 import javax.jdo.listener.LoadLifecycleListener;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.WithTransactionScope;
 import org.apache.isis.applib.services.metrics.MetricsService;
 import org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceInternal;
 
 @RequestScoped
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
 public class MetricsServiceDefault implements MetricsService, InstanceLifecycleListener, LoadLifecycleListener, WithTransactionScope {
 
     private AtomicInteger numberLoaded = new AtomicInteger(0);
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 4c6f2a1..703f320 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
@@ -18,18 +18,13 @@
  */
 package org.apache.isis.core.runtime.services.persistsession;
 
-import static java.util.Objects.requireNonNull;
-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;
-
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.Supplier;
 
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.NonRecoverableException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.services.bookmark.Bookmark;
@@ -52,10 +47,12 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
 import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + (Integer.MAX_VALUE - 1)  // ie before the Noop impl in metamodel
-        )
+import static java.util.Objects.requireNonNull;
+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
 public class PersistenceSessionServiceInternalDefault implements PersistenceSessionServiceInternal {
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
index ef8140f..17db18e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
@@ -21,15 +21,15 @@ package org.apache.isis.core.runtime.services.publish;
 
 import java.sql.Timestamp;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.Predicate;
 
 import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.PublishingChangeKind;
 import org.apache.isis.applib.services.clock.ClockService;
@@ -50,10 +50,6 @@ import org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceIntern
 /**
  * Wrapper around {@link PublisherService}.  Is a no-op if there is no injected service.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
 @RequestScoped
 public class PublishingServiceInternalDefault implements PublishingServiceInternal {
 
@@ -137,7 +133,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
 
     private void publishToPublisherServices(final Interaction.Execution<?,?> execution) {
 
-        if(publisherServices == null || publisherServices.isEmpty()) {
+        if(publisherServices == null || publisherServices.isUnsatisfied()) {
             return;
         }
 
@@ -170,27 +166,13 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
     }
 
     // -- injected services
-    @javax.inject.Inject
-    List<PublisherService> publisherServices;
-
-    @javax.inject.Inject
-    ChangedObjectsServiceInternal changedObjectsServiceInternal;
-
-    @javax.inject.Inject
-    CommandContext commandContext;
-
-    @javax.inject.Inject
-    InteractionContext interactionContext;
-
-    @javax.inject.Inject
-    ClockService clockService;
-
-    @javax.inject.Inject
-    UserService userService;
-
-    @javax.inject.Inject
-    MetricsService metricsService;
-
+    @Inject @Any Instance<PublisherService> publisherServices;
+    @Inject ChangedObjectsServiceInternal changedObjectsServiceInternal;
+    @Inject CommandContext commandContext;
+    @Inject InteractionContext interactionContext;
+    @Inject ClockService clockService;
+    @Inject UserService userService;
+    @Inject MetricsService metricsService;
 
 
 }
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 50d0fa2..ae63423 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
@@ -19,18 +19,15 @@
 
 package org.apache.isis.core.runtime.services.sessmgmt;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
 import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class SessionManagementServiceDefault implements SessionManagementService {
 
     @Programmatic
@@ -49,6 +46,7 @@ public class SessionManagementServiceDefault implements SessionManagementService
 
 
     @javax.inject.Inject
+    
     IsisSessionFactory isisSessionFactory;
     @javax.inject.Inject
     PersistenceSessionServiceInternal persistenceSessionServiceInternal;
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 e8974ab..02d5a1d 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
@@ -19,18 +19,17 @@
 
 package org.apache.isis.core.runtime.services.sudo;
 
-import java.util.List;
 import java.util.concurrent.Callable;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.sudo.SudoService;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class SudoServiceDefault implements SudoService {
 
     @Programmatic
@@ -97,7 +96,6 @@ public class SudoServiceDefault implements SudoService {
         }
     }
 
-    @javax.inject.Inject
-    private List<Spi> spiServices;
+    @Inject @Any Instance<Spi> spiServices;
 
 }
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 64f4afe..44a7238 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
@@ -18,15 +18,14 @@
  */
 package org.apache.isis.core.runtime.services.userprof;
 
+import javax.ejb.Singleton;
 import javax.inject.Inject;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.userprof.UserProfileService;
 import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
 
-@DomainService(nature = NatureOfService.DOMAIN)
+@Singleton
 public class UserProfileServiceDefault implements UserProfileService {
 
     @Programmatic
@@ -35,6 +34,5 @@ public class UserProfileServiceDefault implements UserProfileService {
         return authenticationSessionProvider.getAuthenticationSession().getUserName();
     }
 
-    @Inject
-    AuthenticationSessionProvider authenticationSessionProvider;
+    @Inject AuthenticationSessionProvider authenticationSessionProvider;
 }
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 7d9437f..ff52441 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
@@ -18,9 +18,6 @@
  */
 package org.apache.isis.core.runtime.services.userreg;
 
-import static java.util.regex.Pattern.compile;
-import static java.util.regex.Pattern.quote;
-
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -29,9 +26,9 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.email.EmailService;
 import org.apache.isis.applib.services.userreg.EmailNotificationService;
@@ -40,13 +37,13 @@ import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
 import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
 import org.apache.isis.commons.internal.resources._Resources;
 
+import static java.util.regex.Pattern.compile;
+import static java.util.regex.Pattern.quote;
+
 /**
  * A service that sends email notifications when specific events occur
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class EmailNotificationServiceDefault implements EmailNotificationService {
     
     private static final long serialVersionUID = 1L;
@@ -170,8 +167,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
 
     // -- dependencies
 
-    @javax.inject.Inject
-    private EmailService emailService;
+    @Inject private EmailService emailService;
 
 
 }
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 1e7e5fb..e8038f1 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
@@ -21,8 +21,8 @@ package org.apache.isis.core.runtime.services.xactn;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.services.command.Command;
 import org.apache.isis.applib.services.xactn.Transaction;
 import org.apache.isis.applib.services.xactn.TransactionService;
@@ -31,10 +31,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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 da496ea..51d7c9d 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
@@ -16,8 +16,8 @@
  */
 package org.apache.isis.core.runtime.services.xmlsnapshot;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService;
 import org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotServiceAbstract;
@@ -36,10 +36,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.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@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/SystemConstants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
index 6db6234..94d997b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
@@ -21,10 +21,6 @@ package org.apache.isis.core.runtime.system;
 
 import org.apache.isis.config.ConfigurationConstants;
 import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerInstaller;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManagerInstaller;
 
 public final class SystemConstants {
     
@@ -33,31 +29,16 @@ public final class SystemConstants {
     public static final String MSG_CANCEL = "Cancel";
 
     /**
-     * Key used to lookup {@link AuthenticationManager authentication manager}
-     * in {@link IsisConfiguration}, and root for any
-     * {@link AuthenticationManagerInstaller authentication manager}-specific
-     * configuration keys.
-     */
-    public static final String AUTHENTICATION_INSTALLER_KEY = ConfigurationConstants.ROOT + AuthenticationManagerInstaller.TYPE;
-    /**
      * Default for {@link #AUTHENTICATION_INSTALLER_KEY}.
      */
     public static final String AUTHENTICATION_DEFAULT = "shiro";
 
     /**
-     * Key used to lookup {@link AuthorizationManager authorization manager} in
-     * {@link IsisConfiguration}, and root for any
-     * {@link AuthorizationManagerInstaller authorization manager}-specific
-     * configuration keys.
-     */
-    public static final String AUTHORIZATION_INSTALLER_KEY = ConfigurationConstants.ROOT + AuthorizationManagerInstaller.TYPE;
-    /**
      * Default for {@link #AUTHORIZATION_DEFAULT}.
      */
     public static final String AUTHORIZATION_DEFAULT = "shiro";
 
 
-
     /**
      * Key by which requested fixture (eg via command line) is made available in
      * {@link IsisConfiguration}.
@@ -65,26 +46,6 @@ public final class SystemConstants {
     public final static String FIXTURE_KEY = ConfigurationConstants.ROOT + "fixtures";
 
 
-
-    /**
-     * Key by which requested user (eg via command line) is made available in
-     * {@link IsisConfiguration} .
-     *
-     * @deprecated
-     */
-    @Deprecated
-    public final static String USER_KEY = ConfigurationConstants.ROOT + "user";
-
-    /**
-     * Key by which requested password (eg via command line) is made available
-     * in {@link IsisConfiguration}.
-     *
-     * @deprecated
-     */
-    @Deprecated
-    public final static String PASSWORD_KEY = ConfigurationConstants.ROOT + "password";
-
-
     public static final String LOCALE_KEY = ConfigurationConstants.ROOT + "locale";
 
     private SystemConstants() {
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisInjectModule.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisInjectModule.java
similarity index 63%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisInjectModule.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisInjectModule.java
index 2273f75..b7c0352 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisInjectModule.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisInjectModule.java
@@ -17,36 +17,29 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.viewer.integration.isis;
+package org.apache.isis.core.runtime.system.session;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.Singleton;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
 
 import org.apache.isis.applib.AppManifest;
 import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.internal._Config;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProvider;
 
-public class IsisInjectModule extends AbstractModule {
+public class IsisInjectModule {
 
-    @Override
-    protected void configure() {
-        bind(IsisConfiguration.class).toProvider(_Config::getConfiguration);
-    }
-
-    @Provides
-    @com.google.inject.Inject
-    @Singleton
-    protected IsisSessionFactory provideIsisSessionFactory(IsisConfiguration isisConfiguration) {
+    @Inject private IsisConfiguration isisConfiguration;
+    
+    @Produces @ApplicationScoped
+    protected IsisSessionFactory provideIsisSessionFactory() {
         
         final AppManifest appManifest = isisConfiguration.getAppManifest();
         
         final IsisComponentProvider componentProvider = IsisComponentProvider
-                .builderUsingInstallers(appManifest)
+                .builder(appManifest)
                 .build();
         
         final IsisSessionFactoryBuilder builder =
@@ -58,13 +51,27 @@ public class IsisInjectModule extends AbstractModule {
         
         return sessionFactory;
     }
-
-    @Provides
-    @com.google.inject.Inject
-    @Singleton
-    protected ServicesInjector provideServicesInjector(final IsisSessionFactory isisSessionFactory) {
-        return isisSessionFactory.getServicesInjector();
+    
+    public static class Nested {
+        
+        @Inject private IsisSessionFactory isisSessionFactory;
+    
+        @Produces @ApplicationScoped
+        protected ServicesInjector getServicesInjector() {
+            return isisSessionFactory.getServicesInjector();
+        }
+        
+        @Produces @ApplicationScoped
+        protected SpecificationLoader getSpecificationLoader() {
+            return isisSessionFactory.getSpecificationLoader();
+        }
+        
     }
+    
+    
+    
+    
+    
 
 
 }
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index 631c92e..ba65c9e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -32,7 +32,6 @@ import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.commons.internal.base._Blackhole;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.services.appmanifest.AppManifestProvider;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -64,8 +63,7 @@ import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
  *     it can be {@link Inject}'d into other domain services.
  * </p>
  */
-public class IsisSessionFactory
-implements ApplicationScopedComponent, AppManifestProvider {
+public class IsisSessionFactory implements AppManifestProvider {
 
     //private final static Logger LOG = LoggerFactory.getLogger(IsisSessionFactory.class);
 
@@ -79,7 +77,7 @@ implements ApplicationScopedComponent, AppManifestProvider {
     private final PersistenceSessionFactory persistenceSessionFactory;
     private final AppManifest appManifest;
 
-    public IsisSessionFactory(
+    IsisSessionFactory(
             final ServicesInjector servicesInjector,
             final AppManifest appManifest) {
 
@@ -99,8 +97,6 @@ implements ApplicationScopedComponent, AppManifestProvider {
         return appManifest;
     }
 
-
-
     // -- constructServices, destroyServicesAndShutdown
 
     private ServiceInitializer serviceInitializer;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
index 48ef195..b8a0efa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
@@ -82,10 +82,6 @@ public class IsisSessionFactoryBuilder {
         this.timeZoneInitializer = new IsisTimeZoneInitializer();
     }
 
-    public AppManifest getAppManifest() {
-        return appManifest;
-    }
-
     // -- buildSessionFactory
 
     public IsisSessionFactory buildSessionFactory() {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index ccd3f57..22e28bd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -20,7 +20,6 @@
 package org.apache.isis.core.runtime.systemusinginstallers;
 
 import java.util.Collection;
-import java.util.List;
 
 import org.apache.isis.applib.AppManifest;
 import org.apache.isis.config.IsisConfiguration;
@@ -32,7 +31,6 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
 import org.apache.isis.core.runtime.system.IsisSystemException;
 import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
 import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
@@ -53,24 +51,10 @@ public final class IsisComponentProvider {
         return new IsisComponentProviderBuilder()
                 .appManifest(appManifest);
     }
-    
-    // -- BUILDER - USING INSTALLERS
-    
-    public static IsisComponentProviderBuilder builderUsingInstallers(AppManifest appManifest) {
-        
-        final IsisComponentProviderHelper_UsingInstallers helper = 
-                new IsisComponentProviderHelper_UsingInstallers(appManifest);
-        
-        return builder(appManifest)
-                .authenticationManager(helper.authenticationManager)
-                .authorizationManager(helper.authorizationManager);
-    }
-    
 
     // -- CONSTRUCTOR
 
     private final AppManifest appManifest;
-    protected final List<Object> services;
     protected final AuthenticationManager authenticationManager;
     protected final AuthorizationManager authorizationManager;
 
@@ -80,9 +64,6 @@ public final class IsisComponentProvider {
             final AuthorizationManager authorizationManager) {
 
         this.appManifest = requires(appManifest, "appManifest");
-
-        this.services = new ServicesInstallerFromConfigurationAndAnnotation().getServices();
-
         this.authenticationManager = authenticationManager;
         this.authorizationManager = authorizationManager;
     }
@@ -107,7 +88,6 @@ public final class IsisComponentProvider {
 
     public ServicesInjector provideServiceInjector() {
         return ServicesInjector.builder()
-                .addServices(services)
                 .build();
     }
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderHelper_UsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderHelper_UsingInstallers.java
deleted file mode 100644
index 0c8126a..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderHelper_UsingInstallers.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.systemusinginstallers;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.applib.AppManifest;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.core.commons.factory.InstanceCreationClassException;
-import org.apache.isis.core.commons.factory.InstanceCreationException;
-import org.apache.isis.core.commons.factory.InstanceUtil;
-import org.apache.isis.core.commons.factory.UnavailableClassException;
-import org.apache.isis.core.commons.lang.ObjectExtensions;
-import org.apache.isis.core.runtime.system.SystemConstants;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerInstaller;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManagerInstaller;
-
-class IsisComponentProviderHelper_UsingInstallers  {
-
-    final AppManifest appManifest;
-    final AuthenticationManager authenticationManager;
-    final AuthorizationManager authorizationManager;
-    
-    // -- constructors
-
-    IsisComponentProviderHelper_UsingInstallers(final AppManifest appManifest) {
-        this(appManifest, new InstallerLookup());
-    }
-    
-    private IsisComponentProviderHelper_UsingInstallers(
-            final AppManifest appManifest,
-            final InstallerLookup installerLookup) {
-        
-        this.appManifest = appManifest;
-        this.authenticationManager = lookupAuthenticationManager(appManifest, installerLookup);
-        this.authorizationManager = lookupAuthorizationManager(appManifest, installerLookup);
-    }
-    
-    // -- HELPER
- 
-    private static AuthenticationManager lookupAuthenticationManager(
-            final AppManifest appManifest, final InstallerLookup installerLookup) {
-
-        final String authenticationMechanism = appManifest.getAuthenticationMechanism();
-        final AuthenticationManagerInstaller authenticationInstaller =
-                installerLookup.authenticationManagerInstaller(authenticationMechanism);
-
-        // no longer used, could probably remove
-        //_Config.put(SystemConstants.AUTHENTICATION_INSTALLER_KEY, authenticationMechanism);
-
-        return authenticationInstaller.createAuthenticationManager();
-    }
-
-    private static AuthorizationManager lookupAuthorizationManager(
-            final AppManifest appManifest, final InstallerLookup installerLookup) {
-
-        final String authorizationMechanism = appManifest.getAuthorizationMechanism();
-
-
-        AuthorizationManagerInstaller authorizationInstaller =
-                installerLookup.authorizationManagerInstaller(authorizationMechanism);
-
-        // no longer used, could probably remove
-        //_Config.put(SystemConstants.AUTHORIZATION_INSTALLER_KEY, authorizationMechanism);
-
-        return authorizationInstaller.createAuthorizationManager();
-    }
-
-
-    /**
-     * Looks up authorization and authentication implementations.
-     *
-     * Previously this class was used to lookup the top-level components of
-     * {@link IsisSessionFactoryBuilder} (persistence, authentication, authorization, reflector and so on),
-     * each being looked up from a file called <tt>installer-registry.properties</tt>.
-     * Of these responsibilities, only the support for authentication and authorization remains,
-     * the remainder have only a single implementation.  The implementation has been
-     * substantially simplified.
-     *
-     * Note that it <i>is</i> possible to use other {@link Installer} implementations;
-     * just specify the {@link Installer}'s fully qualified class name.
-     *
-     * @deprecated - intention is to replace in future using CDI
-     */
-    
-    @Deprecated //FIXME [2039] remove installers
-    static class InstallerLookup implements ApplicationScopedComponent {
-
-        private static final Logger LOG = LoggerFactory.getLogger(InstallerLookup.class);
-
-        // -- constructor, fields
-
-        private final List<Installer> installerList = _Lists.newArrayList();
-
-        public InstallerLookup() throws InstanceCreationException {
-            
-
-            final List<String> installerClassNames = _Lists.of(
-                    "org.apache.isis.core.security.authentication.BypassAuthenticationManagerInstaller", // bypass
-                    "org.apache.isis.core.security.authorization.BypassAuthorizationManagerInstaller",   // bypass
-                    
-                    "org.apache.isis.security.pac4j.authentication.Pac4jAuthenticationManagerInstaller", // pac4j
-                    "org.apache.isis.security.pac4j.authorization.Pac4jAuthorizationManagerInstaller",    // pac4j
-                    
-                    "org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller", // shiro
-                    "org.apache.isis.security.shiro.authorization.ShiroAuthorizationManagerInstaller"    // shiro
-                    );
-
-            for (String className : installerClassNames) {
-                if (className.length() == 0 || className.startsWith("#")) {
-                    continue;
-                }
-                try {
-                    //[2039] second arg removed, OK?
-                    final Installer object = (Installer) InstanceUtil.createInstance(className); 
-                    LOG.debug("created component installer: {} - {}", object.getName(), className);
-                    installerList.add(object);
-                } catch (final UnavailableClassException e) {
-                    LOG.info("component installer not found; it will not be available: {}", className);
-                } catch (final InstanceCreationClassException e) {
-                    LOG.info("instance creation exception: {}", e.getMessage());
-                } catch (final InstanceCreationException e) {
-                    try {
-                        final Installer object = (Installer) InstanceUtil.createInstance(className);
-                        LOG.debug("created component installer: {} - {}", object.getName(), className);
-                        installerList.add(object);
-                    } catch (final UnavailableClassException e2) {
-                        LOG.info("component installer not found; it will not be available: {}", className);
-                    } catch (final InstanceCreationClassException e2) {
-                        LOG.info("instance creation exception: {}", e2.getMessage());
-                    }
-                }
-            }
-        }
-
-
-
-        // -- framework
-
-        public AuthenticationManagerInstaller authenticationManagerInstaller(final String requested) {
-
-            return getInstaller(
-                    AuthenticationManagerInstaller.class,
-                    requested,
-                    SystemConstants.AUTHENTICATION_INSTALLER_KEY,
-                    SystemConstants.AUTHENTICATION_DEFAULT);
-        }
-
-        public AuthorizationManagerInstaller authorizationManagerInstaller(final String requested) {
-            return getInstaller(
-                    AuthorizationManagerInstaller.class, requested,
-                    SystemConstants.AUTHORIZATION_INSTALLER_KEY,
-                    SystemConstants.AUTHORIZATION_DEFAULT);
-        }
-
-
-
-        // -- helpers
-        @SuppressWarnings("unchecked")
-        private <T extends Installer> T getInstaller(final Class<T> cls, final String implName) {
-            Assert.assertNotNull("No name specified", implName);
-            for (final Installer installer : installerList) {
-                if (cls.isAssignableFrom(installer.getClass()) && installer.getName().equals(implName)) {
-                    return (T) installer;
-                }
-            }
-            return (T) getInstaller(implName);
-        }
-
-        public Installer getInstaller(final String implClassName) {
-            try {
-                return ObjectExtensions.asT(InstanceUtil.createInstance(implClassName));
-            } catch (final UnavailableClassException e) {
-                return null;
-            }
-        }
-
-        private <T extends Installer> T getInstaller(
-                final Class<T> requiredType,
-                String reqImpl,
-                final String key,
-                final String defaultImpl) {
-            if (reqImpl == null) {
-                reqImpl = _Config.peekAtString(key, defaultImpl);
-            }
-            if (reqImpl == null) {
-                return null;
-            }
-            final T installer = getInstaller(requiredType, reqImpl);
-            if (installer == null) {
-                throw new InstanceCreationException(
-                        "Failed to load installer; named/class:'" + reqImpl + "' (of type " + requiredType.getName() + ")");
-            }
-            return installer;
-        }
-
-    }
-    
-}
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 fc288f4..409abf7 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
@@ -25,12 +25,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.ejb.Singleton;
 import javax.inject.Inject;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.factory.FactoryService;
+import org.apache.isis.applib.services.wrapper.WrapperFactory;
+import org.apache.isis.applib.services.wrapper.WrappingObject;
 import org.apache.isis.applib.services.wrapper.events.ActionArgumentEvent;
 import org.apache.isis.applib.services.wrapper.events.ActionInvocationEvent;
 import org.apache.isis.applib.services.wrapper.events.ActionUsabilityEvent;
@@ -48,8 +49,6 @@ import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
 import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
 import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
 import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
-import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.applib.services.wrapper.WrappingObject;
 import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
 import org.apache.isis.commons.internal.base._Casts;
 import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
@@ -66,15 +65,9 @@ import org.apache.isis.core.wrapper.proxy.ProxyCreator;
  * the Isis programming model.
  *
  * <p>
- * This implementation has no UI-visible actions and is the supported implementation, so it is annotated with
- * {@link org.apache.isis.applib.annotation.DomainService}.   This means that by including
- * <tt>o.a.i.core:isis-core-wrapper</tt> on the classpath, the service is automatically registered; no further
- * configuration is required.
+ * This implementation has no UI-visible actions and is the supported implementation.
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class WrapperFactoryDefault implements WrapperFactory {
 
     private final List<InteractionListener> listeners = new ArrayList<InteractionListener>();
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
index 228ee52..ee2b374 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
@@ -21,8 +21,6 @@ import javax.annotation.PreDestroy;
 import javax.enterprise.context.RequestScoped;
 import javax.jdo.listener.InstanceLifecycleEvent;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.mixins.timestamp.HoldsUpdatedAt;
 import org.apache.isis.applib.mixins.timestamp.HoldsUpdatedBy;
@@ -32,10 +30,6 @@ import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.core.metamodel.JdoMetamodelUtil;
 
 @RequestScoped
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
 public class TimestampService implements
 javax.jdo.listener.StoreLifecycleListener {
 
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/bypass/BypassAuthenticationManagerInstaller.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/bypass/BypassAuthenticationManagerInstaller.java
deleted file mode 100644
index f8f0103..0000000
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/bypass/BypassAuthenticationManagerInstaller.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.security.authentication.bypass;
-
-import java.util.List;
-
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-
-/**
- * Run Isis with open access.
- *
- * To install, use
- * <pre>
- * isis.authentication=none
- * </pre>
- */
-public class BypassAuthenticationManagerInstaller extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
-
-    public BypassAuthenticationManagerInstaller() {
-        super("bypass");
-    }
-
-    @Override
-    protected List<Authenticator> createAuthenticators() {
-        return _Lists.of(new AuthenticatorBypass());
-    }
-
-}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
index 116d262..c259827 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
@@ -20,7 +20,6 @@
 package org.apache.isis.core.security.authentication.manager;
 
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.security.authentication.AuthenticationRequest;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 
@@ -28,7 +27,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSession;
  * Implementing class is added to {@link ServicesInjector} as an (internal) domain service; 
  * all public methods must be annotated using {@link Programmatic}.
  */
-public interface AuthenticationManager extends ApplicationScopedComponent {
+public interface AuthenticationManager {
 
     @Programmatic
     void init();
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManagerInstaller.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManagerInstaller.java
deleted file mode 100644
index 90ed903..0000000
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManagerInstaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.security.authentication.manager;
-
-import org.apache.isis.core.commons.components.Installer;
-
-public interface AuthenticationManagerInstaller extends Installer {
-
-    static String TYPE = "authentication";
-
-    AuthenticationManager createAuthenticationManager();
-
-}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
deleted file mode 100644
index debbb75..0000000
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.security.authentication.manager;
-
-import org.apache.isis.core.security.authentication.fixtures.LogonFixtureAuthenticator;
-import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
-
-public abstract class AuthenticationManagerStandardInstallerAbstractForDfltRuntime 
-extends AuthenticationManagerStandardInstallerAbstract {
-
-
-    public AuthenticationManagerStandardInstallerAbstractForDfltRuntime(final String name) {
-        super(name);
-    }
-
-    /**
-     * Returns an instance of {@link AuthenticationManagerStandard} that has no need to log in when 
-     * running in prototyping mode.
-     *
-     * <p>
-     * Specifically:
-     * <ul>
-     * <li> the {@link LogonFixtureAuthenticator} will set up a session (using credentials and roles), 
-     * provided running in prototyping mode.
-     * </ul>
-     */
-    @Override
-    protected AuthenticationManagerStandard createAuthenticationManagerStandard() {
-        
-        final AuthenticationManagerStandard authenticationManager = new AuthenticationManagerStandard();
-
-        // we add to start to ensure that these special case authenticators are always consulted first
-        authenticationManager.addAuthenticatorToStart(new LogonFixtureAuthenticator());
-
-        return authenticationManager;
-    }
-
-}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
deleted file mode 100644
index 1b61ac9..0000000
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.security.authentication.standard;
-
-import java.util.List;
-
-import org.apache.isis.core.commons.components.InstallerAbstract;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManagerInstaller;
-
-public abstract class AuthenticationManagerStandardInstallerAbstract extends InstallerAbstract implements AuthenticationManagerInstaller {
-
-    public AuthenticationManagerStandardInstallerAbstract(final String name) {
-        super(name);
-    }
-
-    @Override
-    public final AuthenticationManager createAuthenticationManager() {
-        final AuthenticationManagerStandard authenticationManager = createAuthenticationManagerStandard();
-        for (final Authenticator authenticator : createAuthenticators()) {
-            authenticationManager.addAuthenticator(authenticator);
-        }
-        return authenticationManager;
-    }
-
-    protected AuthenticationManagerStandard createAuthenticationManagerStandard() {
-        return new AuthenticationManagerStandard();
-    }
-
-    /**
-     * Hook method
-     *
-     * @return
-     */
-    protected abstract List<Authenticator> createAuthenticators();
-
-    @Override
-    public List<Class<?>> getTypes() {
-        return listOf(AuthenticationManager.class);
-    }
-
-}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
index d61715e..f22a54c 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
@@ -19,11 +19,10 @@
 
 package org.apache.isis.core.security.authentication.standard;
 
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.security.authentication.AuthenticationRequest;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 
-public interface Authenticator extends ApplicationScopedComponent {
+public interface Authenticator {
 
     void init();
     void shutdown();
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
index dbeb219..9264125 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
@@ -23,10 +23,9 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 
 import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
 
-public interface Registrar extends Authenticator, ApplicationScopedComponent {
+public interface Registrar extends Authenticator {
 
     static Predicate<Registrar> NON_NULL = _NullSafe::isPresent; 
 
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/bypass/BypassAuthorizationManagerInstaller.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/bypass/BypassAuthorizationManagerInstaller.java
deleted file mode 100644
index 179d4d8..0000000
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/bypass/BypassAuthorizationManagerInstaller.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.security.authorization.bypass;
-
-import org.apache.isis.core.security.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
-
-public class BypassAuthorizationManagerInstaller extends AuthorizationManagerStandardInstallerAbstract {
-
-    public BypassAuthorizationManagerInstaller() {
-        super("bypass");
-    }
-
-    @Override
-    protected Authorizor createAuthorizor() {
-        return new AuthorizorBypass();
-    }
-
-}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
index d317449..54c4907 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.security.authorization.manager;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 
 /**
@@ -30,7 +29,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSession;
  * Implementing class is added to {@link ServicesInjector} as an (internal) domain service; all public methods
  * must be annotated using {@link Programmatic}.
  */
-public interface AuthorizationManager extends ApplicationScopedComponent {
+public interface AuthorizationManager {
 
     @Programmatic
     void init();
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManagerInstaller.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManagerInstaller.java
deleted file mode 100644
index c7ce34f..0000000
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManagerInstaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.security.authorization.manager;
-
-import org.apache.isis.core.commons.components.Installer;
-
-public interface AuthorizationManagerInstaller extends Installer {
-
-    static String TYPE = "authorization";
-
-    AuthorizationManager createAuthorizationManager();
-
-}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
deleted file mode 100644
index 521b591..0000000
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.security.authorization.standard;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.components.InstallerAbstract;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManagerInstaller;
-
-public abstract class AuthorizationManagerStandardInstallerAbstract
-extends InstallerAbstract
-implements AuthorizationManagerInstaller {
-
-    public AuthorizationManagerStandardInstallerAbstract(final String name) {
-        super(name);
-    }
-
-    @Override
-    public AuthorizationManager createAuthorizationManager() {
-        
-        try {
-            return createAuthorizationManagerReflective();
-            
-        } catch (Exception e) {
-            
-            throw new RuntimeException("unable to create AuthorizationManager reflective", e);
-            
-        }
-    }
-    
-    //TODO [2040] maybe, there's a way to this more straight forward, without resorting to reflection 
-    private AuthorizationManager createAuthorizationManagerReflective() 
-            throws ClassNotFoundException, IllegalAccessException, IllegalArgumentException, 
-            InvocationTargetException, 
-            NoSuchMethodException, SecurityException, InstantiationException {
-        
-        final String authorizationManagerStandardClsName = 
-                "org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandard";
-        
-        final Class<? extends AuthorizationManager> cls = _Casts.uncheckedCast(
-                _Context.loadClassAndInitialize(authorizationManagerStandardClsName));
-        
-        final AuthorizationManager authorizationManager = cls.newInstance();
-        final Authorizor authorizor = createAuthorizor();
-        
-        Method setter = cls.getDeclaredMethod("setAuthorizor", new Class[] {Authorizor.class});
-        
-        setter.setAccessible(true);
-        setter.invoke(authorizationManager, new Object[] {authorizor});
-        setter.setAccessible(false);
-        
-        return authorizationManager;
-    }
-    
-    //TODO [2040] first attempt to decouple modules 'security' and 'metamodel' left us with having
-    // to replace this direct code with a reflective one
-//    @Override
-//    public AuthorizationManager createAuthorizationManager() {
-//        final AuthorizationManagerStandard authorizationManager = new AuthorizationManagerStandard();
-//        final Authorizor authorizor = createAuthorizor();
-//        authorizationManager.setAuthorizor(authorizor);
-//        
-//        return authorizationManager;
-//    }
-
-    /**
-     * Hook method
-     */
-    protected abstract Authorizor createAuthorizor();
-
-    @Override
-    public List<Class<?>> getTypes() {
-        return listOf(AuthorizationManager.class);
-    }
-
-}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
index b47c6d2..4d39192 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
@@ -20,9 +20,8 @@
 package org.apache.isis.core.security.authorization.standard;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 
-public interface Authorizor extends ApplicationScopedComponent {
+public interface Authorizor {
 
     void init();
     void shutdown();
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 3a3a01a..d8e0424 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
@@ -1,4 +1,4 @@
-/**
+/*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with
  *  this work for additional information regarding copyright ownership.
@@ -16,15 +16,16 @@
  */
 package org.apache.isis.viewer.restfulobjects.rendering.service;
 
-import java.util.List;
 import java.util.function.Function;
 
 import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ActionResultReprRenderer.SelfLink;
@@ -36,10 +37,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;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class RepresentationServiceContentNegotiator implements RepresentationService {
 
 
@@ -190,7 +188,5 @@ public class RepresentationServiceContentNegotiator implements RepresentationSer
         return responseBuilder.build();
     }
 
-
-    @javax.inject.Inject
-    List<ContentNegotiationService> contentNegotiationServices;
+    @Inject @Any Instance<ContentNegotiationService> contentNegotiationServices;
 }
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
index 4bd477b..20e9a26 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
@@ -20,6 +20,9 @@ package org.apache.isis.viewer.restfulobjects.rendering.service.conneg;
 
 import java.util.List;
 
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
@@ -154,7 +157,6 @@ public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationSe
         return domainObject;
     }
 
-    @javax.inject.Inject
-    List<ContentMappingService> contentMappingServices;
+    @Inject @Any Instance<ContentMappingService> contentMappingServices;
 
 }
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 27cd303..192618c 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -66,6 +66,11 @@
             <artifactId>isis-core-runtime</artifactId>
         </dependency>
 
+    	<dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-cdi</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-auth-roles</artifactId>
@@ -87,12 +92,7 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice-parent</artifactId>
-            <version>${guice.version}</version>
-            <type>pom</type>
-        </dependency>
+	
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 9b348c1..6c55f2f 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -20,6 +20,7 @@
 package org.apache.isis.viewer.wicket.viewer;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
 import java.util.ServiceLoader;
@@ -29,10 +30,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.function.Function;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.ConverterLocator;
@@ -45,6 +44,7 @@ import org.apache.wicket.authentication.IAuthenticationStrategy;
 import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.cdi.CdiConfiguration;
 import org.apache.wicket.core.request.mapper.MountedMapper;
 import org.apache.wicket.devutils.debugbar.DebugBar;
 import org.apache.wicket.devutils.debugbar.InspectorDebugPanel;
@@ -52,7 +52,6 @@ import org.apache.wicket.devutils.debugbar.PageSizeDebugPanel;
 import org.apache.wicket.devutils.debugbar.SessionSizeDebugPanel;
 import org.apache.wicket.devutils.debugbar.VersionDebugContributor;
 import org.apache.wicket.devutils.diskstore.DebugDiskDataStore;
-import org.apache.wicket.guice.GuiceComponentInjector;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.ResourceAggregator;
 import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
@@ -69,13 +68,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.wicketstuff.select2.ApplicationSettings;
 
+import org.apache.isis.commons.internal.cdi._CDI;
 import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.resources._Resources;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
 import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisInjectModule;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 import org.apache.isis.core.runtime.threadpool.ThreadPoolSupport;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
@@ -97,7 +99,6 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
 import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
 import org.apache.isis.viewer.wicket.ui.pages.login.WicketLogoutPage;
 import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
-import org.apache.isis.viewer.wicket.viewer.integration.isis.IsisInjectModule;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapter;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
@@ -175,41 +176,13 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
         return (IsisWicketApplication) AuthenticatedWebApplication.get();
     }
 
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    private ComponentFactoryRegistry componentFactoryRegistry;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @SuppressWarnings("unused")
-    @com.google.inject.Inject
-    private ImageResourceCache imageCache;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @SuppressWarnings("unused")
-    @com.google.inject.Inject
-    private WicketViewerSettings wicketViewerSettings;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    private PageClassRegistry pageClassRegistry;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    private IsisSessionFactory isisSessionFactory;
-
-    @com.google.inject.Inject
-    private WicketViewerSettings settings;
-
+    @Inject private ComponentFactoryRegistry componentFactoryRegistry;
+    @Inject private ImageResourceCache imageCache;
+    @Inject private WicketViewerSettings wicketViewerSettings;
+    @Inject private PageClassRegistry pageClassRegistry;
+    @Inject private IsisSessionFactory isisSessionFactory;
+    @Inject private WicketViewerSettings settings;
+    
     private final IsisWicketApplication_Experimental experimental;
 
 
@@ -266,7 +239,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
         List<Future<Object>> futures = null;
         try {
             super.init();
-
+            
             futures = startBackgroundInitializationThreads();
 
             getRequestCycleSettings().setRenderStrategy(RequestCycleSettings.RenderStrategy.REDIRECT_TO_RENDER);
@@ -276,17 +249,22 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
             IRequestCycleListener requestCycleListenerForIsis = newWebRequestCycleForIsis();
             requestCycleListeners.add(requestCycleListenerForIsis);
             requestCycleListeners.add(new PageRequestHandlerTracker());
-
-            //
-            // create IsisSessionFactory
-            //
-            final Injector injector = Guice.createInjector(
-                    newIsisModule(), 
-                    newIsisWicketModule());
-            
-            initWicketComponentInjection(injector);
             
-            injector.injectMembers(this); // populates this.isisSessionFactory
+            // configure wicket/cdi
+            BeanManager beanManager = _CDI.cdi().get().getBeanManager();
+            new CdiConfiguration(beanManager).configure(this);
+
+
+//            // FIXME
+//            // create IsisSessionFactory
+//            //
+//            final Injector injector = Guice.createInjector(
+//                    newIsisModule(), 
+//                    newIsisWicketModule());
+//            
+//            initWicketComponentInjection(injector);
+//            
+//            injector.injectMembers(this); // populates this.isisSessionFactory
             Ensure.ensure("IsisSessionFactory should have been injected.", this.isisSessionFactory != null);
             
             if (requestCycleListenerForIsis instanceof WebRequestCycleForIsis) {
@@ -444,8 +422,10 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
             return fallback;
         }
         try {
-            List<String> readLines = Resources.readLines(Resources.getResource(contextClass, resourceName), Charsets.UTF_8);
-            return String.join("\n", readLines);
+            
+            return _Resources.loadAsString(contextClass, resourceName, StandardCharsets.UTF_8)
+                    .replace("\r", "");
+            
         } catch (IOException | IllegalArgumentException e) {
             return fallback;
         }
@@ -682,8 +662,8 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
     // //////////////////////////////////////
 
 
-    protected void initWicketComponentInjection(final Injector injector) {
-        getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector, false));
+    protected void initWicketComponentInjection(/*final Injector injector*/) {
+        //FIXME getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector, false));
     }
 
     // /////////////////////////////////////////////////
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
index 2e1d3aa..d5b2ff5 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
@@ -19,39 +19,8 @@
 
 package org.apache.isis.viewer.wicket.viewer;
 
-import java.io.InputStream;
-
 import javax.servlet.ServletContext;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Provider;
-import com.google.inject.name.Names;
-
-import org.apache.isis.applib.services.email.EmailService;
-import org.apache.isis.applib.services.userreg.EmailNotificationService;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.internal._Config;
-import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
-import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
-import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
-import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
-import org.apache.isis.viewer.wicket.ui.pages.accmngt.EmailVerificationUrlServiceDefault;
-import org.apache.isis.viewer.wicket.viewer.imagecache.ImageResourceCacheClassPath;
-import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault;
-import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistryDefault;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageNavigationServiceDefault;
-import org.apache.isis.viewer.wicket.viewer.services.EmailNotificationServiceWicket;
-import org.apache.isis.viewer.wicket.viewer.services.EmailServiceWicket;
-import org.apache.isis.viewer.wicket.viewer.settings.WicketViewerSettingsDefault;
-
-import static org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.readLines;
-
 /**
  * To override
  *
@@ -69,7 +38,7 @@ import static org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.readLin
  * final Module overridden = Modules.override(isisDefaults).with(myAppOverrides);
  * </pre>
  */
-public class IsisWicketModule extends AbstractModule {
+public class IsisWicketModule {
 
     private ServletContext servletContext;
 
@@ -78,70 +47,69 @@ public class IsisWicketModule extends AbstractModule {
         this.servletContext = servletContext;
     }
 
-    @Override
     protected void configure() {
-        bind(ComponentFactoryRegistry.class).to(ComponentFactoryRegistryDefault.class);
-        bind(PageClassRegistry.class).to(PageClassRegistryDefault.class);
-        bind(EmailVerificationUrlService.class).to(EmailVerificationUrlServiceDefault.class);
-        bind(PageNavigationService.class).to(PageNavigationServiceDefault.class);
-        bind(PageClassList.class).to(PageClassListDefault.class);
-        bind(ComponentFactoryRegistrar.class).to(ComponentFactoryRegistrarDefault.class);
-        bind(ImageResourceCache.class).to(ImageResourceCacheClassPath.class);
-        bind(WicketViewerSettings.class).to(WicketViewerSettingsDefault.class);
+        //bind(ComponentFactoryRegistry.class).to(ComponentFactoryRegistryDefault.class);
+//        bind(PageClassRegistry.class).to(PageClassRegistryDefault.class);
+//        bind(EmailVerificationUrlService.class).to(EmailVerificationUrlServiceDefault.class);
+//        bind(PageNavigationService.class).to(PageNavigationServiceDefault.class);
+//        bind(PageClassList.class).to(PageClassListDefault.class);
+//        bind(ComponentFactoryRegistrar.class).to(ComponentFactoryRegistrarDefault.class);
+//        bind(ImageResourceCache.class).to(ImageResourceCacheClassPath.class);
+//        bind(WicketViewerSettings.class).to(WicketViewerSettingsDefault.class);
 
         // these services need to be bound because they injected directly into
         // Wicket panels outside of the Isis runtime.
-        bind(EmailService.class).to(EmailServiceWicket.class);
-        bind(EmailNotificationService.class).to(EmailNotificationServiceWicket.class);
-
-        bind(String.class).annotatedWith(Names.named("applicationName"))
-                .toProvider(string("isis.viewer.wicket.application.name", "Apache Isis â„¢"));
-
-        bind(String.class).annotatedWith(Names.named("brandLogoHeader"))
-                .toProvider(string("isis.viewer.wicket.application.brandLogoHeader"));
-
-        bind(String.class).annotatedWith(Names.named("brandLogoSignin"))
-                .toProvider(string("isis.viewer.wicket.application.brandLogoSignin"));
-
-        bind(String.class).annotatedWith(Names.named("applicationCss"))
-                .toProvider(string("isis.viewer.wicket.application.css", "css/application.css"));
-
-        bind(String.class).annotatedWith(Names.named("applicationJs"))
-                .toProvider(string("isis.viewer.wicket.application.js", "css/application.js"));
-
-        bind(String.class).annotatedWith(Names.named("aboutMessage"))
-                .toProvider(stringOrElse("isis.viewer.wicket.application.about",
-                        string("isis.viewer.wicket.application.name")));
-
-        final Provider<String> welcomeFile = string("isis.viewer.wicket.welcome.file", "welcome.html");
-        bind(String.class).annotatedWith(Names.named("welcomeMessage"))
-                .toProvider(() -> readLines(getClass(), welcomeFile.get(),
-                        getConfiguration().getString("isis.viewer.wicket.welcome.text")));
-
-        bind(String.class).annotatedWith(Names.named("applicationVersion"))
-                .toProvider(string("isis.viewer.wicket.application.version"));
-
-        bind(InputStream.class).annotatedWith(Names.named("metaInfManifest"))
-                .toProvider(() -> servletContext.getResourceAsStream("/META-INF/MANIFEST.MF"));
+//        bind(EmailService.class).to(EmailServiceWicket.class);
+//        bind(EmailNotificationService.class).to(EmailNotificationServiceWicket.class);
+
+//        bind(String.class).annotatedWith(Names.named("applicationName"))
+//                .toProvider(string("isis.viewer.wicket.application.name", "Apache Isis â„¢"));
+//
+//        bind(String.class).annotatedWith(Names.named("brandLogoHeader"))
+//                .toProvider(string("isis.viewer.wicket.application.brandLogoHeader"));
+//
+//        bind(String.class).annotatedWith(Names.named("brandLogoSignin"))
+//                .toProvider(string("isis.viewer.wicket.application.brandLogoSignin"));
+//
+//        bind(String.class).annotatedWith(Names.named("applicationCss"))
+//                .toProvider(string("isis.viewer.wicket.application.css", "css/application.css"));
+//
+//        bind(String.class).annotatedWith(Names.named("applicationJs"))
+//                .toProvider(string("isis.viewer.wicket.application.js", "css/application.js"));
+//
+//        bind(String.class).annotatedWith(Names.named("aboutMessage"))
+//                .toProvider(stringOrElse("isis.viewer.wicket.application.about",
+//                        string("isis.viewer.wicket.application.name")));
+//
+//        final Provider<String> welcomeFile = string("isis.viewer.wicket.welcome.file", "welcome.html");
+//        bind(String.class).annotatedWith(Names.named("welcomeMessage"))
+//                .toProvider(() -> readLines(getClass(), welcomeFile.get(),
+//                        getConfiguration().getString("isis.viewer.wicket.welcome.text")));
+//
+//        bind(String.class).annotatedWith(Names.named("applicationVersion"))
+//                .toProvider(string("isis.viewer.wicket.application.version"));
+//
+//        bind(InputStream.class).annotatedWith(Names.named("metaInfManifest"))
+//                .toProvider(() -> servletContext.getResourceAsStream("/META-INF/MANIFEST.MF"));
 
     }
     
     // -- HELPER
     
-    private Provider<String> string(String key) {
-        return ()->getConfiguration().getString(key);
-    }
-    
-    private Provider<String> string(String key, String defaultValue) {
-        return ()->getConfiguration().getString(key, defaultValue);
-    }
-    
-    private Provider<String> stringOrElse(String key, Provider<String> fallback) {
-        return ()->getConfiguration().getString(key, fallback.get());
-    }
-    
-    private IsisConfiguration getConfiguration() {
-        return _Config.getConfiguration();
-    }
+//    private Provider<String> string(String key) {
+//        return ()->getConfiguration().getString(key);
+//    }
+//    
+//    private Provider<String> string(String key, String defaultValue) {
+//        return ()->getConfiguration().getString(key, defaultValue);
+//    }
+//    
+//    private Provider<String> stringOrElse(String key, Provider<String> fallback) {
+//        return ()->getConfiguration().getString(key, fallback.get());
+//    }
+//    
+//    private IsisConfiguration getConfiguration() {
+//        return _Config.getConfiguration();
+//    }
     
 }
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 58dbdf3..cec9e61 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
@@ -24,8 +24,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import javax.ejb.Singleton;
+
 import com.google.common.collect.Maps;
-import com.google.inject.Singleton;
 
 import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.request.resource.ResourceReference;
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 d6d6af7..5fa6fdb 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
@@ -16,11 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-
 package org.apache.isis.viewer.wicket.viewer.registries.components;
 
 import java.util.ServiceLoader;
 
+import javax.ejb.Singleton;
+
 import org.apache.isis.commons.internal.context._Plugin;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
@@ -86,8 +87,6 @@ import org.apache.isis.viewer.wicket.ui.components.voidreturn.VoidReturnPanelFac
 import org.apache.isis.viewer.wicket.ui.components.welcome.WelcomePanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanelFactory;
 
-import com.google.inject.Singleton;
-
 /**
  * Default implementation of {@link ComponentFactoryRegistrar} that registers a
  * hardcoded set of built-in {@link ComponentFactory}s, along with any
@@ -101,9 +100,7 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
     public void addComponentFactories(final ComponentFactoryList componentFactories) {
 
         addComponentFactoriesActingAsSelectors(componentFactories);
-
         addComponentFactoriesUsingServiceLoader(componentFactories);
-
         addBuiltInComponentFactories(componentFactories);
     }
 
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 025dbec..1720c68 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
@@ -24,18 +24,17 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.inject.Inject;
+import javax.ejb.Singleton;
 
 import com.google.common.base.Supplier;
-import org.apache.isis.commons.internal.collections._Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
-import com.google.inject.Singleton;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.model.IModel;
 
+import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
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 a706da3..9fdca13 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
@@ -19,7 +19,7 @@
 
 package org.apache.isis.viewer.wicket.viewer.registries.pages;
 
-import com.google.inject.Singleton;
+import javax.ejb.Singleton;
 
 import org.apache.wicket.Page;
 
@@ -27,13 +27,13 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistrySpi;
 import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage;
+import org.apache.isis.viewer.wicket.ui.pages.accmngt.password_reset.PasswordResetPage;
+import org.apache.isis.viewer.wicket.ui.pages.accmngt.register.RegisterPage;
+import org.apache.isis.viewer.wicket.ui.pages.accmngt.signup.RegistrationFormPage;
 import org.apache.isis.viewer.wicket.ui.pages.actionprompt.ActionPromptPage;
 import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
 import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
 import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
-import org.apache.isis.viewer.wicket.ui.pages.accmngt.password_reset.PasswordResetPage;
-import org.apache.isis.viewer.wicket.ui.pages.accmngt.register.RegisterPage;
-import org.apache.isis.viewer.wicket.ui.pages.accmngt.signup.RegistrationFormPage;
 import org.apache.isis.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
 import org.apache.isis.viewer.wicket.ui.pages.value.ValuePage;
 import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
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 0c031ce..11958a9 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
@@ -21,9 +21,11 @@ package org.apache.isis.viewer.wicket.viewer.registries.pages;
 
 import java.util.Map;
 
+import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
+
 import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
 
 import org.apache.wicket.Page;
 
@@ -43,16 +45,10 @@ public class PageClassRegistryDefault implements PageClassRegistry, PageClassReg
 
     private final Map<PageType, Class<? extends Page>> pagesByType = Maps.newHashMap();
 
-    /**
-     * {@link Inject}ed in {@link #PageClassRegistryDefault(PageClassList)
-     * constructor}.
-     */
-    @SuppressWarnings("unused")
-    private final PageClassList pageClassList;
+    @Inject PageClassList pageClassList;
 
-    @com.google.inject.Inject
-    public PageClassRegistryDefault(final PageClassList pageClassList) {
-        this.pageClassList = pageClassList;
+    @PostConstruct
+    public void init() {
         pageClassList.registerPages(this);
         ensureAllPageTypesRegistered();
     }
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 5ce1f9e..6f6e624 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
@@ -19,7 +19,8 @@
 
 package org.apache.isis.viewer.wicket.viewer.registries.pages;
 
-import com.google.inject.Singleton;
+import javax.ejb.Singleton;
+import javax.inject.Inject;
 
 import org.apache.wicket.Page;
 import org.apache.wicket.RestartResponseAtInterceptPageException;
@@ -39,12 +40,8 @@ public class PageNavigationServiceDefault implements PageNavigationService {
 
     private static final long serialVersionUID = 1L;
 
-    private final PageClassRegistry pageClassRegistry;
-
-    @com.google.inject.Inject
-    public PageNavigationServiceDefault(final PageClassRegistry pageClassRegistry) {
-        this.pageClassRegistry = pageClassRegistry;
-    }
+    @Inject
+    private PageClassRegistry pageClassRegistry;
 
     @Override
     public void navigateTo(PageType pageType) {
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 8f04658..8184b80 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
@@ -21,15 +21,15 @@ package org.apache.isis.viewer.wicket.viewer.services;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import javax.ejb.Singleton;
+import javax.inject.Inject;
+
 import org.apache.wicket.Page;
 import org.apache.wicket.request.Url;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.services.guice.GuiceBeanProvider;
 import org.apache.isis.applib.services.linking.DeepLinkService;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -42,10 +42,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
  * An implementation of {@link org.apache.isis.applib.services.linking.DeepLinkService}
  * for Wicket Viewer
  */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
+@Singleton
 public class DeepLinkServiceWicket implements DeepLinkService {
 
     @Programmatic
@@ -55,7 +52,7 @@ public class DeepLinkServiceWicket implements DeepLinkService {
         final ObjectAdapter objectAdapter = getPersistenceSession().adapterFor(domainObject);
         final PageParameters pageParameters = EntityModel.createPageParameters(objectAdapter);
 
-        PageClassRegistry pageClassRegistry = guiceBeanProvider.lookup(PageClassRegistry.class);
+        //PageClassRegistry pageClassRegistry = guiceBeanProvider.lookup(PageClassRegistry.class);
         final Class<? extends Page> pageClass = pageClassRegistry.getPageClass(PageType.ENTITY);
 
         final RequestCycle requestCycle = RequestCycle.get();
@@ -72,9 +69,8 @@ public class DeepLinkServiceWicket implements DeepLinkService {
         return isisSessionFactory.getCurrentSession().getPersistenceSession();
     }
 
-    @javax.inject.Inject
-    private IsisSessionFactory isisSessionFactory;
-
-    @javax.inject.Inject
-    private GuiceBeanProvider guiceBeanProvider;
+    @Inject private IsisSessionFactory isisSessionFactory;
+    @Inject private PageClassRegistry pageClassRegistry;
+    
+    
 }
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 b296202..bcd9cc7 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
@@ -16,13 +16,15 @@
  */
 package org.apache.isis.viewer.wicket.viewer.services;
 
+import javax.ejb.Singleton;
+
 import org.apache.isis.applib.services.userreg.EmailNotificationService;
 import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
 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;
 
-@com.google.inject.Singleton // necessary because is registered in and injected by guice
+@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/services/EmailServiceWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailServiceWicket.java
deleted file mode 100644
index ece07e6..0000000
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailServiceWicket.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.isis.viewer.wicket.viewer.services;
-
-import java.util.List;
-
-import javax.activation.DataSource;
-
-import org.apache.isis.applib.services.email.EmailService;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-
-@com.google.inject.Singleton // necessary because is registered in and injected by guice
-public class EmailServiceWicket implements EmailService {
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public void init() {
-        // delegate is a managed object, hence the framework takes care of initializing it
-    }
-
-    @Override
-    public boolean send(List<String> to, List<String> cc, List<String> bcc, String subject, String body,
-            DataSource... attachments) {
-        return delegate.get().send(to, cc, bcc, subject, body, attachments);
-    }
-
-    @Override
-    public boolean isConfigured() {
-        return delegate.get().isConfigured();
-    }
-
-    // -- HELPER
-
-    private final transient _Lazy<EmailService> delegate = _Lazy.of(this::loadDelegate);   
-
-    private EmailService loadDelegate() {
-        return IsisContext.getServicesInjector().lookupServiceElseFail(EmailService.class);
-    }
-
-}
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java
deleted file mode 100644
index ce326b4..0000000
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.isis.viewer.wicket.viewer.services;
-
-import java.lang.annotation.Annotation;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import org.apache.wicket.Application;
-import org.apache.wicket.guice.GuiceInjectorHolder;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.services.guice.GuiceBeanProvider;
-
-/**
- * An implementation of {@link org.apache.isis.applib.services.guice.GuiceBeanProvider}
- * that uses the Injector configured for Wicket
- */
-@DomainService(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = "" + Integer.MAX_VALUE
-        )
-public class GuiceBeanProviderWicket implements GuiceBeanProvider {
-
-    @Programmatic
-    @Override
-    public <T> T lookup(final Class<T> beanType) {
-        final Application application = Application.get();
-        final GuiceInjectorHolder injectorHolder = application.getMetaData(GuiceInjectorHolder.INJECTOR_KEY);
-        final Injector injector = injectorHolder.getInjector();
-        return injector.getInstance(beanType);
-    }
-
-    @Programmatic
-    @Override
-    public <T> T lookup(final Class<T> beanType, final Annotation qualifier) {
-        final Application application = Application.get();
-        final GuiceInjectorHolder injectorHolder = application.getMetaData(GuiceInjectorHolder.INJECTOR_KEY);
-        final Injector injector = injectorHolder.getInjector();
-        return injector.getInstance(Key.get(beanType, qualifier));
-    }
-}
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 1ad27ac..6d98682 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
@@ -19,7 +19,7 @@
 
 package org.apache.isis.viewer.wicket.viewer.settings;
 
-import com.google.inject.Singleton;
+import javax.ejb.Singleton;
 
 import org.apache.isis.applib.annotation.PromptStyle;
 import org.apache.isis.config.IsisConfiguration;
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
index 879cff2..b51a552 100644
--- a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
+++ b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
@@ -19,104 +19,73 @@
 
 package org.apache.isis.viewer.wicket.viewer;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import javax.servlet.ServletContext;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
-
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
-import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault;
-import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistryDefault;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault;
-
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 @RunWith(Parameterized.class)
 public class isisWicketModule_bindingsStandard_Test {
 
-    @Rule
-    public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
-    @Mock
-    private ServletContext mockServletContext;
-
-    private IsisWicketModule isisWicketModule;
-	private Injector injector;
-	private final Class<?> from;
-	private final Class<?> to;
-
-
-	@Parameters
-	public static Collection<Object[]> params() {
-		return Arrays.asList(new Object[][] { 
-			{ ComponentFactoryRegistrar.class, ComponentFactoryRegistrarDefault.class }, 
-			{ ComponentFactoryRegistry.class, ComponentFactoryRegistryDefault.class }, 
-			{ PageClassList.class, PageClassListDefault.class },
-			{ PageClassRegistry.class, PageClassRegistryDefault.class }, 
-		});
-	}
-
-	public isisWicketModule_bindingsStandard_Test(final Class<?> from, final Class<?> to) {
-		this.from = from;
-		this.to = to;
-	}
-
-	@Before
-	public void setUp() throws Exception {
-	    
-	    _Config.clear();
-		        
-        isisWicketModule = new IsisWicketModule(mockServletContext);
-
-        context.checking(new Expectations() {{
-            allowing(mockServletContext);
-        }});
-
-		injector = Guice.createInjector(isisWicketModule, new ConfigModule());
-	}
-
-	@Test
-	public void binding() {
-		final Object instance = injector.getInstance(from);
-		assertThat(instance, is(instanceOf(to)));
-	}
-
-	// -- CONFIGURATION BINDING
-
-	private static class ConfigModule extends AbstractModule {
-
-        @Override 
-		protected void configure() {
-			bind(IsisConfiguration.class).toProvider(new Provider<IsisConfiguration>() {
-                @Override
-                public IsisConfiguration get() {
-                    return _Config.getConfiguration();
-                }
-            });
-		}
-	}
+//FIXME    
+//    @Rule
+//    public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+//
+//    @Mock
+//    private ServletContext mockServletContext;
+//
+//    private IsisWicketModule isisWicketModule;
+//	private Injector injector;
+//	private final Class<?> from;
+//	private final Class<?> to;
+//
+//
+//	@Parameters
+//	public static Collection<Object[]> params() {
+//		return Arrays.asList(new Object[][] { 
+//			{ ComponentFactoryRegistrar.class, ComponentFactoryRegistrarDefault.class }, 
+//			{ ComponentFactoryRegistry.class, ComponentFactoryRegistryDefault.class }, 
+//			{ PageClassList.class, PageClassListDefault.class },
+//			{ PageClassRegistry.class, PageClassRegistryDefault.class }, 
+//		});
+//	}
+//
+//	public isisWicketModule_bindingsStandard_Test(final Class<?> from, final Class<?> to) {
+//		this.from = from;
+//		this.to = to;
+//	}
+//
+//	@Before
+//	public void setUp() throws Exception {
+//	    
+//	    _Config.clear();
+//		        
+//        isisWicketModule = new IsisWicketModule(mockServletContext);
+//
+//        context.checking(new Expectations() {{
+//            allowing(mockServletContext);
+//        }});
+//
+//		injector = Guice.createInjector(isisWicketModule, new ConfigModule());
+//	}
+//
+//	@Test
+//	public void binding() {
+//		final Object instance = injector.getInstance(from);
+//		assertThat(instance, is(instanceOf(to)));
+//	}
+//
+//	// -- CONFIGURATION BINDING
+//
+//	private static class ConfigModule extends AbstractModule {
+//
+//        @Override 
+//		protected void configure() {
+//			bind(IsisConfiguration.class).toProvider(new Provider<IsisConfiguration>() {
+//                @Override
+//                public IsisConfiguration get() {
+//                    return _Config.getConfiguration();
+//                }
+//            });
+//		}
+//	}
 
 }
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java
index 1898edd..ab55d1f 100644
--- a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java
+++ b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java
@@ -22,13 +22,14 @@ package org.apache.isis.viewer.wicket.viewer.pages;
 import org.apache.wicket.Page;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.apache.isis.viewer.wicket.model.models.ActionModel;
 import org.apache.isis.viewer.wicket.model.models.PageType;
 import org.apache.isis.viewer.wicket.ui.pages.actionprompt.ActionPromptPage;
 import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
+import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault_Instantiation;
 import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault;
 
-import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
@@ -43,7 +44,7 @@ public class PageClassListDefault_RegistrationAndCaching {
         // necessary to provide an implementation that will register
         // all pages with the registry.
         final PageClassListDefault pageClassList = new PageClassListDefault();
-        registryImpl = new PageClassRegistryDefault(pageClassList);
+        registryImpl = PageClassListDefault_Instantiation.newPageClassRegistryDefault(pageClassList);
     }
 
     @Test
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
similarity index 80%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java
rename to core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
index 4861d62..e758613 100644
--- a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java
+++ b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.viewer.pages;
+package org.apache.isis.viewer.wicket.viewer.registries.pages;
 
 import org.jmock.Expectations;
 import org.jmock.Mockery;
@@ -30,8 +30,6 @@ import org.junit.runner.RunWith;
 
 import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistrySpi;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault;
 
 @RunWith(JMock.class)
 public class PageClassListDefault_Instantiation {
@@ -51,7 +49,7 @@ public class PageClassListDefault_Instantiation {
         // necessary to provide an implementation that will register
         // all pages with the registry.
         final PageClassListDefault pageClassList = new PageClassListDefault();
-        new PageClassRegistryDefault(pageClassList);
+        newPageClassRegistryDefault(pageClassList);
     }
 
     @Test(expected = IllegalStateException.class)
@@ -63,7 +61,16 @@ public class PageClassListDefault_Instantiation {
                 mockPageClassList.registerPages(with(any(PageClassRegistrySpi.class)));
             }
         });
-        new PageClassRegistryDefault(mockPageClassList);
+        newPageClassRegistryDefault(mockPageClassList);
     }
+    
+    // -- HELPER
 
+    public static PageClassRegistryDefault newPageClassRegistryDefault(PageClassList pageClassList) {
+        PageClassRegistryDefault pageClassRegistry = new PageClassRegistryDefault();
+        pageClassRegistry.pageClassList = pageClassList;
+        pageClassRegistry.init();
+        return pageClassRegistry;
+    }
+    
 }
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index 4dc04a7..37c9b8e 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -92,17 +92,6 @@
             <artifactId>wicket-auth-roles</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-guice</artifactId>
-            <exclusions>
-            	<!-- already provided by JEE API -->
-            	<exclusion>
-            		<groupId>javax.inject</groupId>
-            		<artifactId>javax.inject</artifactId>
-            	</exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.wicketstuff</groupId>
             <artifactId>wicketstuff-select2</artifactId>
         </dependency>
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
index a8b2a18..958e5fc 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
@@ -21,10 +21,12 @@ package org.apache.isis.viewer.wicket.ui.components.about;
 
 import java.io.InputStream;
 
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.apache.wicket.markup.html.basic.Label;
 
+import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.viewer.wicket.model.models.AboutModel;
 import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -39,17 +41,8 @@ public class AboutPanel extends PanelAbstract<AboutModel> {
 
     private static final String ID_MANIFEST_ATTRIBUTES = "manifestAttributes";
 
-    @com.google.inject.Inject
-    @Named("applicationName")
-    private String applicationName;
-
-    @com.google.inject.Inject
-    @Named("applicationVersion")
-    private String applicationVersion;
-
-    @com.google.inject.Inject
-    @Named("aboutMessage")
-    private String aboutMessage;
+    @Inject
+    private WebAppConfigBean webAppConfigBean;
 
     private static final String ID_APPLICATION_NAME = "applicationName";
     private static final String ID_APPLICATION_VERSION = "applicationVersion";
@@ -58,6 +51,7 @@ public class AboutPanel extends PanelAbstract<AboutModel> {
 
     public static class LabelVisibleOnlyIfNonEmpty extends Label {
 
+        private static final long serialVersionUID = 1L;
         private final String label;
 
         public LabelVisibleOnlyIfNonEmpty(final String id, final String label) {
@@ -78,7 +72,7 @@ public class AboutPanel extends PanelAbstract<AboutModel> {
      *     Is <code>transient</code> because
      * </p>
      */
-    @com.google.inject.Inject
+    @Inject
     @Named("metaInfManifest")
     private transient InputStream metaInfManifestIs;
 
@@ -87,9 +81,9 @@ public class AboutPanel extends PanelAbstract<AboutModel> {
     public AboutPanel(final String id) {
         super(id);
 
-        add(new LabelVisibleOnlyIfNonEmpty(ID_APPLICATION_NAME, applicationName));
-        add(new LabelVisibleOnlyIfNonEmpty(ID_APPLICATION_VERSION, applicationVersion));
-        add(new LabelVisibleOnlyIfNonEmpty(ID_ABOUT_MESSAGE, aboutMessage));
+        add(new LabelVisibleOnlyIfNonEmpty(ID_APPLICATION_NAME, webAppConfigBean.getApplicationName()));
+        add(new LabelVisibleOnlyIfNonEmpty(ID_APPLICATION_VERSION, webAppConfigBean.getApplicationVersion()));
+        add(new LabelVisibleOnlyIfNonEmpty(ID_ABOUT_MESSAGE, webAppConfigBean.getAboutMessage()));
 
         if(jarManifestModel == null) {
             jarManifestModel = new JarManifestModel(metaInfManifestIs);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index 033b36a..b0d78d4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -20,8 +20,8 @@ package org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
 
 import java.util.List;
 
-import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import javax.inject.Inject;
+
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.head.CssHeaderItem;
@@ -34,6 +34,8 @@ import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.request.resource.CssResourceReference;
 
 import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
 
 /**
  * A panel responsible to render the application actions as menu in a navigation bar.
@@ -119,10 +121,7 @@ public class TertiaryActionsPanel extends Panel {
         response.render(CssHeaderItem.forReference(new CssResourceReference(TertiaryActionsPanel.class, "TertiaryActionsPanel.css")));
     }
 
-    /**
-     * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
+    @Inject
     private PageClassRegistry pageClassRegistry;
 
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index 1d07f98..f5015d4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.components.bookmarkedpages;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.Page;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -78,7 +80,7 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
 
     private static final JavaScriptResourceReference SLIDE_PANEL_JS = new JavaScriptResourceReference(BookmarkedPagesPanel.class, "slide-panel.js");
 
-    @com.google.inject.Inject
+    @Inject
     private PageClassRegistry pageClassRegistry;
 
     public BookmarkedPagesPanel(final String id, final BookmarkedPagesModel bookmarkedPagesModel) {
@@ -231,7 +233,7 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
     // Dependency Injection
     // ///////////////////////////////////////////////
 
-    @com.google.inject.Inject
+    @Inject
     private ImageResourceCache imageCache;
 
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 5ea13af..bd0c733 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.components.entity.icontitle;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -229,16 +231,16 @@ public class EntityIconAndTitlePanel extends PanelAbstract<ObjectAdapterModel> {
     // Dependency Injection
     // ///////////////////////////////////////////////
 
-    @com.google.inject.Inject
+    @Inject
     private transient IsisSessionFactory isisSessionFactory;
 
-    @com.google.inject.Inject
+    @Inject
     private ImageResourceCache imageCache;
     protected ImageResourceCache getImageCache() {
         return imageCache;
     }
 
-    @com.google.inject.Inject
+    @Inject
     private WicketViewerSettings settings;
     @Override
     protected WicketViewerSettings getSettings() {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
index 7502691..42ad18f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
@@ -23,6 +23,7 @@ import org.apache.wicket.model.Model;
 
 public class CreditName extends Label {
 
+    private static final long serialVersionUID = 1L;
     private String name;
 
     public CreditName(final String id, final String name) {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
index 01fb589..f203677 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.wicket.ui.components.footer;
 
-import com.google.inject.name.Named;
+import javax.inject.Inject;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
@@ -34,6 +34,7 @@ import org.apache.wicket.model.ResourceModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
 import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
 import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
@@ -55,11 +56,6 @@ public class FooterPanel extends PanelAbstract<Model<String>> {
     private static final String ID_ABOUT_MESSAGE = "aboutMessage";
     private static final String ID_THEME_PICKER = "themePicker";
 
-    @com.google.inject.Inject
-    @Named("applicationVersion")
-    private String applicationVersion;
-
-
     /**
      * Constructor.
      *
@@ -170,6 +166,8 @@ public class FooterPanel extends PanelAbstract<Model<String>> {
         final String creditId = credit.getId();
         if(url != null) {
             creditLink = new ExternalLink(creditId, url) {
+                private static final long serialVersionUID = 1L;
+
                 @Override
                 protected void onComponentTag(ComponentTag tag)
                 {
@@ -215,6 +213,8 @@ public class FooterPanel extends PanelAbstract<Model<String>> {
         final BookmarkablePageLink<Void> aboutLink = new BookmarkablePageLink<>(ID_ABOUT_LINK, AboutPage.class);
         add(aboutLink);
 
+        String applicationVersion = webAppConfigBean.getApplicationVersion();
+        
         final Label aboutLabel =
                  applicationVersion != null && !applicationVersion.isEmpty()?
                     new Label(ID_ABOUT_MESSAGE,  applicationVersion) :
@@ -238,4 +238,7 @@ public class FooterPanel extends PanelAbstract<Model<String>> {
         final ThemeChooser themeChooser = new ThemeChooser(ID_THEME_PICKER);
         addOrReplace(themeChooser);
     }
+    
+    @Inject private WebAppConfigBean webAppConfigBean;
+    
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index ad42e75..9e34999 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars;
 
 import java.io.Serializable;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
@@ -346,7 +348,7 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
         return facet != null ? facet.value() : null;
     }
 
-    @com.google.inject.Inject
+    @Inject
     WicketViewerSettings settings;
     @Override
     protected WicketViewerSettings getSettings() {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index 6141211..0e44a4f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars;
 
 import java.io.Serializable;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.basic.Label;
@@ -124,7 +126,7 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
 
 
 
-    @com.google.inject.Inject
+    @Inject
     WicketViewerSettings settings;
     @Override
     protected WicketViewerSettings getSettings() {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index c641074..4b59883 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.reference;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -450,7 +452,7 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract implements PanelW
 
     // //////////////////////////////////////
 
-    @com.google.inject.Inject
+    @Inject
     WicketViewerSettings wicketViewerSettings;
 
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index 4e29455..d483e39 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -18,6 +18,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.valuechoices;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -150,7 +152,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract impleme
         return scalarModel;
     }
 
-    @com.google.inject.Inject
+    @Inject
     WicketViewerSettings wicketViewerSettings;
 
     @Override
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
index 2ca9e8f..18bbb8b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
@@ -19,10 +19,11 @@
 
 package org.apache.isis.viewer.wicket.ui.components.welcome;
 
-import com.google.inject.name.Named;
+import javax.inject.Inject;
 
 import org.apache.wicket.markup.html.basic.Label;
 
+import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
 import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -37,12 +38,13 @@ public class WelcomePanel extends PanelAbstract<WelcomeModel> {
 
     private static final String ID_MESSAGE = "message";
 
-    @com.google.inject.Inject
-    @Named("welcomeMessage")
-    private String welcomeMessage;
-
+    @Inject private WebAppConfigBean webAppConfigBean;
+    
     public WelcomePanel(final String id, final WelcomeModel model) {
         super(id, model);
+        
+        String welcomeMessage = webAppConfigBean.getWelcomeMessage();
+        
         model.setObject(welcomeMessage);
         final Label label = new Label(ID_MESSAGE, welcomeMessage);
         // safe to not escape, welcome message is read from file (part of deployed WAR)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
index 51a8fac..8615112 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
@@ -16,24 +16,22 @@
  */
 package org.apache.isis.viewer.wicket.ui.components.widgets.favicon;
 
-import com.google.inject.name.Named;
+import javax.inject.Inject;
 
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.util.string.Strings;
 
+import org.apache.isis.config.beans.WebAppConfigBean;
+
 /**
  * A component for application favorite icon
  */
 public class Favicon extends WebComponent {
 
-    @com.google.inject.Inject(optional = true)
-    @Named("faviconUrl")
-    private String url;
-
-    @com.google.inject.Inject(optional = true)
-    @Named("faviconContentType")
-    private String contentType;
+    private static final long serialVersionUID = 1L;
+    
+    @Inject private WebAppConfigBean webAppConfigBean;
 
     public Favicon(String id) {
         super(id);
@@ -42,7 +40,8 @@ public class Favicon extends WebComponent {
     @Override
     protected void onConfigure() {
         super.onConfigure();
-
+        
+        String url = webAppConfigBean.getFaviconUrl();
         setVisible(!Strings.isEmpty(url));
     }
 
@@ -50,8 +49,11 @@ public class Favicon extends WebComponent {
     protected void onComponentTag(ComponentTag tag) {
         super.onComponentTag(tag);
 
+        String url = webAppConfigBean.getFaviconUrl();
+        String contentType = webAppConfigBean.getFaviconContentType();
+        
         tag.put("href", url);
-
+        
         if (!Strings.isEmpty(contentType)) {
             tag.put("type", contentType);
         }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index 1e0eea0..ac99ed0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -18,24 +18,23 @@
  */
 package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
 
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.WebComponent;
 
+import org.apache.isis.config.beans.WebAppConfigBean;
+
 /**
  * A component used as a brand logo in the top-left corner of the navigation bar
  */
 public class BrandLogo extends WebComponent {
 
-    private final Placement placement;
+    private static final long serialVersionUID = 1L;
 
-    @com.google.inject.Inject(optional = true)
-    @Named("brandLogoHeader")
-    private String logoHeaderUrl;
+    private final Placement placement;
 
-    @com.google.inject.Inject(optional = true)
-    @Named("brandLogoSignin")
-    private String logoSigninUrl;
+    @Inject private WebAppConfigBean webAppConfigBean;
 
     /**
      * Constructor.
@@ -62,6 +61,9 @@ public class BrandLogo extends WebComponent {
     }
 
     private String url() {
+        String logoHeaderUrl = webAppConfigBean.getBrandLogoHeader();
+        String logoSigninUrl = webAppConfigBean.getBrandLogoSignin();
+        
         return placement.urlFor(logoHeaderUrl, logoSigninUrl);
     }
 
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index f0b2a4a..8796865 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -18,29 +18,23 @@
  */
 package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
 
-import com.google.inject.name.Named;
+import javax.inject.Inject;
 
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.Model;
 
+import org.apache.isis.config.beans.WebAppConfigBean;
+
 /**
  * A component used as a brand logo in the top-left corner of the navigation bar
  */
 public class BrandName extends Label {
 
-    private final Placement placement;
-
-    @com.google.inject.Inject
-    @Named("applicationName")
-    private String applicationName;
+    private static final long serialVersionUID = 1L;
 
-    @com.google.inject.Inject(optional = true)
-    @Named("brandLogoHeader")
-    private String logoHeaderUrl;
+    private final Placement placement;
 
-    @com.google.inject.Inject(optional = true)
-    @Named("brandLogoSignin")
-    private String logoSigninUrl;
+    @Inject private WebAppConfigBean webAppConfigBean;
 
     /**
      * Constructor.
@@ -51,12 +45,19 @@ public class BrandName extends Label {
     public BrandName(final String id, final Placement placement) {
         super(id);
         this.placement = placement;
+        
+        String applicationName = webAppConfigBean.getApplicationName();
+        
         setDefaultModel(Model.of(applicationName));
     }
 
     @Override
     protected void onConfigure() {
         super.onConfigure();
+        
+        String logoHeaderUrl = webAppConfigBean.getBrandLogoHeader();
+        String logoSigninUrl = webAppConfigBean.getBrandLogoSignin();
+        
         setVisible(placement.urlFor(logoHeaderUrl, logoSigninUrl) == null);
     }
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
index c77f601..e5c69d7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
@@ -19,16 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.errors;
 
-import org.apache.isis.applib.services.error.Ticket;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
-import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
-import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
-import org.apache.isis.viewer.wicket.ui.util.Components;
-import org.apache.isis.viewer.wicket.ui.util.Links;
+import javax.inject.Inject;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.Page;
@@ -44,6 +36,17 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
 
+import org.apache.isis.applib.services.error.Ticket;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
+import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
+import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
+import org.apache.isis.viewer.wicket.ui.util.Components;
+import org.apache.isis.viewer.wicket.ui.util.Links;
+
 public class ExceptionStackTracePanel extends Panel {
 
     private static final long serialVersionUID = 1L;
@@ -137,7 +140,7 @@ public class ExceptionStackTracePanel extends Panel {
 
     }
 
-    @com.google.inject.Inject
+    @Inject
     PageClassRegistry pageClassRegistry;
 
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 970d666..6a064a6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.stream.Stream;
 
-import com.google.inject.name.Named;
+import javax.inject.Inject;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
@@ -64,6 +64,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
 import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -138,34 +139,9 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
     public static ThreadLocal<ExceptionModel> EXCEPTION = new ThreadLocal<>();
 
     private final List<ComponentType> childComponentIds;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    @Named("applicationName")
-    private String applicationName;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject(optional = true)
-    @Named("applicationCss")
-    private String applicationCss;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     *///
-    @com.google.inject.Inject(optional = true)
-    @Named("applicationJs")
-    private String applicationJs;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    private PageClassRegistry pageClassRegistry;
-
+    
+    @Inject private WebAppConfigBean webAppConfigBean;
+    @Inject private PageClassRegistry pageClassRegistry;
 
     /**
      * Top-level &lt;div&gt; to which all content is added.
@@ -192,6 +168,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
 
             themeDiv = new WebMarkupContainer(ID_THEME);
             add(themeDiv);
+            String applicationName = webAppConfigBean.getApplicationName();
             if(applicationName != null) {
                 themeDiv.add(new CssClassAppender(CssClassAppender.asCssStyle(applicationName)));
             }
@@ -275,7 +252,9 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
 
 
     protected void setTitle(final String title) {
-        addOrReplace(new Label(ID_PAGE_TITLE, title != null? title: applicationName));
+        addOrReplace(new Label(ID_PAGE_TITLE, title != null
+                ? title
+                        : webAppConfigBean.getApplicationName()));
     }
 
     private Class<? extends Page> getSignInPage() {
@@ -300,9 +279,11 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
         final JGrowlBehaviour jGrowlBehaviour = new JGrowlBehaviour();
         jGrowlBehaviour.renderFeedbackMessages(response);
 
+        String applicationCss = webAppConfigBean.getApplicationCss();
         if(applicationCss != null) {
             response.render(CssReferenceHeaderItem.forUrl(applicationCss));
         }
+        String applicationJs = webAppConfigBean.getApplicationJs();
         if(applicationJs != null) {
             response.render(JavaScriptReferenceHeaderItem.forUrl(applicationJs));
         }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index a037288..dd5bafb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.viewer.wicket.ui.pages.accmngt;
 
-import com.google.inject.name.Named;
+import javax.inject.Inject;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.MarkupContainer;
@@ -37,6 +37,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.beans.WebAppConfigBean;
 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.models.PageType;
@@ -69,26 +70,7 @@ public class AccountManagementPageAbstract extends WebPage {
      */
     public static final String FEEDBACK_COOKIE_NAME = "isis.feedback.success";
 
-    /**
-     * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    @Named("applicationName")
-    private String applicationName;
-
-    /**
-     * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    @Named("applicationCss")
-    private String applicationCss;
-
-    /**
-     * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    @Named("applicationJs")
-    private String applicationJs;
+    @Inject private WebAppConfigBean webAppConfigBean;
 
     /**
      * If set by {@link org.apache.isis.viewer.wicket.ui.pages.PageAbstract}.
@@ -122,6 +104,7 @@ public class AccountManagementPageAbstract extends WebPage {
 
 
     private MarkupContainer addPageTitle() {
+        String applicationName = webAppConfigBean.getApplicationName();
         return add(new Label(ID_PAGE_TITLE, applicationName));
     }
 
@@ -139,9 +122,11 @@ public class AccountManagementPageAbstract extends WebPage {
         response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(
                 BootstrapJavaScriptReference.instance())));
 
+        String applicationCss = webAppConfigBean.getApplicationCss();
         if(applicationCss != null) {
             response.render(CssReferenceHeaderItem.forUrl(applicationCss));
         }
+        String applicationJs = webAppConfigBean.getApplicationJs();
         if(applicationJs != null) {
             response.render(JavaScriptReferenceHeaderItem.forUrl(applicationJs));
         }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
index c0f2058..9399bf1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
@@ -22,6 +22,8 @@ package org.apache.isis.viewer.wicket.ui.pages.accmngt.password_reset;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.StatelessForm;
@@ -35,6 +37,7 @@ import org.apache.wicket.validation.validator.EmailAddressValidator;
 import org.apache.isis.applib.services.email.EmailService;
 import org.apache.isis.applib.services.userreg.EmailNotificationService;
 import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
+import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.viewer.wicket.model.models.PageType;
 import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
 import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
@@ -47,6 +50,8 @@ import org.apache.isis.viewer.wicket.ui.pages.accmngt.EmailAvailableValidator;
  */
 public class PasswordResetEmailPanel extends Panel {
 
+    private static final long serialVersionUID = 1L;
+    
     /**
      * Constructor
      *
@@ -70,6 +75,8 @@ public class PasswordResetEmailPanel extends Panel {
         formGroup.add(emailField);
 
         Button signUpButton = new Button("passwordResetSubmit") {
+            private static final long serialVersionUID = 1L;
+
             @Override
             public void onSubmit() {
                 super.onSubmit();
@@ -87,7 +94,11 @@ public class PasswordResetEmailPanel extends Panel {
                 emailNotificationService.init();
                 emailService.init();
 
-                final PasswordResetEvent passwordResetEvent = new PasswordResetEvent(email, confirmationUrl, applicationName);
+                final PasswordResetEvent passwordResetEvent = new PasswordResetEvent(
+                        email, 
+                        confirmationUrl, 
+                        webAppConfigBean.getApplicationName());
+                
                 boolean emailSent = emailNotificationService.send(passwordResetEvent);
                 if (emailSent) {
                     Map<String, String> map = new HashMap<>();
@@ -105,20 +116,10 @@ public class PasswordResetEmailPanel extends Panel {
         form.add(signUpButton);
     }
 
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private EmailNotificationService emailNotificationService;
-
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private EmailService emailService;
-
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private EmailVerificationUrlService emailVerificationUrlService;
-
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private PageNavigationService pageNavigationService;
-
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    @com.google.inject.name.Named("applicationName")
-    private String applicationName;
+    @Inject private EmailNotificationService emailNotificationService;
+    @Inject private EmailService emailService;
+    @Inject private EmailVerificationUrlService emailVerificationUrlService;
+    @Inject private PageNavigationService pageNavigationService;
+    @Inject private WebAppConfigBean webAppConfigBean;
 
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
index 79902d3..5ceb0b0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.pages.accmngt.signup;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import org.apache.isis.viewer.wicket.model.models.PageType;
@@ -34,8 +36,7 @@ public class RegistrationFormPage extends AccountManagementPageAbstract {
 
     private static final long serialVersionUID = 1L;
 
-    @com.google.inject.Inject
-    private PageNavigationService pageNavigationService;
+    @Inject private PageNavigationService pageNavigationService;
 
     public RegistrationFormPage(final PageParameters parameters) {
         this(parameters, getAndClearExceptionModelIfAny());
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
index 38ab9a3..06602e9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
@@ -22,6 +22,8 @@ package org.apache.isis.viewer.wicket.ui.pages.accmngt.signup;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.StatelessForm;
@@ -34,6 +36,7 @@ import org.apache.wicket.validation.validator.EmailAddressValidator;
 import org.apache.isis.applib.services.email.EmailService;
 import org.apache.isis.applib.services.userreg.EmailNotificationService;
 import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
+import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.viewer.wicket.model.models.PageType;
 import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
 import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
@@ -48,6 +51,8 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
  */
 public class RegistrationFormPanel extends Panel {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor
      *
@@ -73,6 +78,8 @@ public class RegistrationFormPanel extends Panel {
         formGroup.add(emailField);
 
         Button signUpButton = new Button("signUp") {
+            private static final long serialVersionUID = 1L;
+
             @Override
             public void onSubmit() {
                 super.onSubmit();
@@ -89,7 +96,11 @@ public class RegistrationFormPanel extends Panel {
                 emailNotificationService.init();
                 emailService.init();
 
-                final EmailRegistrationEvent emailRegistrationEvent = new EmailRegistrationEvent(email, confirmationUrl, applicationName);
+                final EmailRegistrationEvent emailRegistrationEvent = new EmailRegistrationEvent(
+                        email, 
+                        confirmationUrl, 
+                        webAppConfigBean.getApplicationName());
+                
                 boolean emailSent = emailNotificationService.send(emailRegistrationEvent);
                 if (emailSent) {
                     Map<String, String> map = new HashMap<>();
@@ -106,19 +117,11 @@ public class RegistrationFormPanel extends Panel {
         form.add(signUpButton);
     }
 
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private EmailNotificationService emailNotificationService;
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private EmailService emailService;
-
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private EmailVerificationUrlService emailVerificationUrlService;
-
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private PageNavigationService pageNavigationService;
+    @Inject private EmailNotificationService emailNotificationService;
+    @Inject private EmailService emailService;
+    @Inject private EmailVerificationUrlService emailVerificationUrlService;
+    @Inject private PageNavigationService pageNavigationService;
+    @Inject private WebAppConfigBean webAppConfigBean;
 
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    @com.google.inject.name.Named("applicationName")
-    private String applicationName;
 
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
index 1e8b241..ad8f8d4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
@@ -39,12 +39,48 @@
                 <button type="reset" class="btn btn-default"><wicket:message key="resetButtonLabel"/></button>
 
                 <div class="form-group">
-                    <a wicket:id="passwdResetLink" class="btn btn-block btn-link"><wicket:message key="forgotPasswordLinkLabel"/></a>
+                    <a wicket:id="passwdResetLink" class="btn btn-block btn-link">
+                    	<wicket:message key="forgotPasswordLinkLabel"/>
+                    </a>
                 </div>
 
                 <div class="form-group" wicket:enclosure="signUpLink">
-                    <a wicket:id="signUpLink" class="btn btn-block btn-info"><wicket:message key="signUpButtonLabel"/></a>
+                    <a wicket:id="signUpLink" class="btn btn-block btn-info">
+                    	<wicket:message key="signUpButtonLabel"/>
+                    </a>
                 </div>
+                
+                <hr />
+                
+                <style>
+                 .loginPanel .socialButtons {
+ 					line-height:2.5;
+ 				 }
+                </style>
+                
+                <div class="socialButtons">
+                
+                	<button class="btn btn-sm btn-social btn-github">
+						<span class="fa fa-github"></span>
+						<wicket:message key="signInWithButtonLabelPrefix"/>
+						Github
+					</button>
+                
+                    <button class="btn btn-sm btn-social btn-google">
+						<span class="fa fa-google"></span>
+						<wicket:message key="signInWithButtonLabelPrefix"/>
+						Google
+					</button>
+					
+					<button class="btn btn-sm btn-social btn-twitter">
+						<span class="fa fa-twitter"></span>
+						<wicket:message key="signInWithButtonLabelPrefix"/>
+						Twitter
+					</button>
+					
+                </div>
+                
+                
             </form>
 
         </wicket:panel>
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 763d269..9e747b7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -25,7 +25,6 @@ import org.apache.wicket.Page;
 import org.apache.wicket.authroles.authentication.panel.SignInPanel;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 
-import org.apache.isis.applib.services.email.EmailService;
 import org.apache.isis.applib.services.userreg.EmailNotificationService;
 import org.apache.isis.applib.services.userreg.UserRegistrationService;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -76,6 +75,8 @@ public class IsisSignInPanel extends SignInPanel {
     protected void onInitialize() {
         super.onInitialize();
 
+        
+        
         addOrReplace(new NotificationPanel("feedback"));
 
         final Component passwordResetLink = addPasswordResetLink();
@@ -160,11 +161,12 @@ public class IsisSignInPanel extends SignInPanel {
 
     @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
     private PageClassRegistry pageClassRegistry;
-
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private EmailNotificationService emailNotificationService;
-
-    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
-    private EmailService emailService;
+    
+//not used
+//    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
+//    private EmailNotificationService emailNotificationService;
+//
+//    @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
+//    private EmailService emailService;
 
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
index 93657e5..42cd61b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.pages.login;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.WebPage;
 
@@ -39,10 +41,6 @@ public class WicketLogoutPage extends WebPage {
         return pageClassRegistry.getPageClass(PageType.SIGN_IN);
     }
 
-    /**
-     * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    PageClassRegistry pageClassRegistry;
+    @Inject PageClassRegistry pageClassRegistry;
 
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
index 3727ba1..521213b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
@@ -39,6 +39,10 @@
 	margin-top:-100px;
  }
  
+ .loginPanel .socialButtons {
+ 	line-height:2.5;
+ }
+ 
  .loginPanel h2 {
  	color:#423D37;
  	font-size:1.6em;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
index 75aff05..4c49627 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
@@ -22,14 +22,29 @@
       xmlns:wicket="http://wicket.apache.org"
       xml:lang="en"  
       lang="en">
-    <body>
+
+<wicket:head>
+  <wicket:link>
+    
+<!--     <link href="https://lipis.github.io/bootstrap-social/assets/css/bootstrap.css" rel="stylesheet" type="text/css" /> -->
+    <link href="https://lipis.github.io/bootstrap-social/assets/css/font-awesome.css" rel="stylesheet" type="text/css" />
+    <link href="https://lipis.github.io/bootstrap-social/bootstrap-social.css" rel="stylesheet" type="text/css" />	
+    
+  </wicket:link>
+  
+</wicket:head>
+
+
+	<body>
         <wicket:extend>
+      
             <div class="row">
                 <div class="loginPanel col-sm-offset-4 col-sm-4">
                     <h2><wicket:message key="loginHeader">Login</wicket:message></h2>
                     <div wicket:id="signInPanel"></div>
                 </div>
             </div>
+            
         </wicket:extend>
     </body>
 </html>
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
index 53f15ac..24ad846 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
@@ -22,6 +22,7 @@ usernameLabel=Username
 passwordLabel=Password
 rememberMeLabel=Remember me
 signInButtonLabel=Sign in
+signInWithButtonLabelPrefix=Sign in with
 resetButtonLabel=Reset
 forgotPasswordLinkLabel=Forgot your password?
 signUpButtonLabel=Don't have an account? Sign up now.
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 1b31474..ae41938 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -22,10 +22,7 @@ package org.apache.isis.viewer.wicket.ui.pages.mmverror;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.config.IsisConfiguration;
-
-import com.google.inject.name.Named;
+import javax.inject.Inject;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.MarkupContainer;
@@ -41,6 +38,9 @@ import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
+import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 
@@ -55,28 +55,6 @@ public class MmvErrorPage extends WebPage {
 
     private static final String ID_PAGE_TITLE = "pageTitle";
     private static final String ID_APPLICATION_NAME = "applicationName";
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    @Named("applicationName")
-    private String applicationName;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    @Named("applicationCss")
-    private String applicationCss;
-
-    /**
-     * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
-     */
-    @com.google.inject.Inject
-    @Named("applicationJs")
-    private String applicationJs;
-
     private static final String ID_ERROR = "error";
     private static final String ID_ERROR_MESSAGE = "errorMessage";
 
@@ -97,15 +75,17 @@ public class MmvErrorPage extends WebPage {
     }
 
     private MarkupContainer addPageTitle() {
-        return add(new Label(ID_PAGE_TITLE, applicationName));
+        return add(new Label(ID_PAGE_TITLE, webAppConfigBean.getApplicationName()));
     }
 
     private void addApplicationName() {
-        add(new Label(ID_APPLICATION_NAME, applicationName));
+        add(new Label(ID_APPLICATION_NAME, webAppConfigBean.getApplicationName()));
     }
 
     private void addValidationErrors() {
         ListView<String> validationErrorsView = new ListView<String>(ID_ERROR, getModel()) {
+            private static final long serialVersionUID = 1L;
+
             @Override
             protected void populateItem(ListItem<String> item) {
                 final String validationError = item.getModelObject();
@@ -121,9 +101,11 @@ public class MmvErrorPage extends WebPage {
         response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
         response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(BootstrapJavaScriptReference.instance())));
 
+        String applicationCss = webAppConfigBean.getApplicationCss();
         if(applicationCss != null) {
             response.render(CssReferenceHeaderItem.forUrl(applicationCss));
         }
+        String applicationJs = webAppConfigBean.getApplicationJs();
         if(applicationJs != null) {
             response.render(JavaScriptReferenceHeaderItem.forUrl(applicationJs));
         }
@@ -146,4 +128,6 @@ public class MmvErrorPage extends WebPage {
         return IsisContext.getSessionFactory();
     }
 
+    @Inject private WebAppConfigBean webAppConfigBean;
+    
 }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 8017a57..666552d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.panels;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
@@ -181,9 +183,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel {
         return IsisContext.getSessionFactory();
     }
 
-
-    @com.google.inject.Inject
-    WicketViewerSettings settings;
+    @Inject WicketViewerSettings settings;
     protected WicketViewerSettings getSettings() {
         return settings;
     }
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
index e094001..5cae3b1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.panels;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.model.IModel;
 
 import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
@@ -30,15 +32,14 @@ import org.apache.isis.viewer.wicket.model.models.FormExecutorContext;
  */
 public abstract class PromptFormPanelAbstract<T extends IModel<?> & FormExecutorContext> extends PanelAbstract<T> {
 
-
-
+    private static final long serialVersionUID = 1L;
+    
     public PromptFormPanelAbstract(final String id, final T model) {
         super(id, model);
     }
 
     // -- dependencies
-    @com.google.inject.Inject
-    WicketViewerSettings settings;
+    @Inject WicketViewerSettings settings;
     @Override
     protected WicketViewerSettings getSettings() {
         return settings;
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index a69f274..c69012f 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -161,6 +161,12 @@
 
 
         <!-- ISIS CORE PLUGINS -->
+        
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>isis-core-plugins-ioc-weld</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>isis-core-plugins-codegen-bytebuddy</artifactId>
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
index 489ad92..f95b05b 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -18,6 +18,10 @@
  */
 package domainapp.application;
 
+import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+
 import org.apache.isis.applib.AppManifestAbstract2;
 import org.apache.isis.config.AppConfig;
 import org.apache.isis.config.IsisConfiguration;
@@ -27,7 +31,7 @@ import domainapp.dom.HelloWorldModule;
 /**
  * Bootstrap the application.
  */
-@javax.ejb.Singleton // only if you want AppConfig to be managed by CDI (if available), otherwise not required
+@Singleton // only if you want AppConfig to be managed by CDI (if available), otherwise not required
 public class HelloWorldAppManifest extends AppManifestAbstract2 implements AppConfig {
 
     public static final Builder BUILDER = Builder
@@ -40,7 +44,7 @@ public class HelloWorldAppManifest extends AppManifestAbstract2 implements AppCo
     }
 
     // Implementing AppConfig, to tell the framework how to bootstrap the configuration.
-    @Override
+    @Override @Produces @ApplicationScoped
     public IsisConfiguration isisConfiguration () {
         return IsisConfiguration.buildFromAppManifest(this);
     }
diff --git a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
index 375f6f5..abb6e55 100644
--- a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
+++ b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
@@ -20,6 +20,7 @@ package domainapp.dom.impl;
 
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.jdo.JDOQLTypedQuery;
 
 import org.apache.isis.applib.annotation.Action;
@@ -66,10 +67,7 @@ public class HelloWorldObjects {
         return repositoryService.allInstances(HelloWorldObject.class);
     }
 
-    @javax.inject.Inject
-    RepositoryService repositoryService;
-
-    @javax.inject.Inject
-    IsisJdoSupport_v3_2 isisJdoSupport;
+    @Inject RepositoryService repositoryService;
+    @Inject IsisJdoSupport_v3_2 isisJdoSupport;
 
 }