You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/09/27 09:57:47 UTC

[isis] branch v2 updated: ISIS-2086: integrating the new configuration beans with the framework

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


The following commit(s) were added to refs/heads/v2 by this push:
     new 28c8585  ISIS-2086: integrating the new configuration beans with the framework
28c8585 is described below

commit 28c8585f8b8c2a032ee18bb48882202bcd8e1558
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 27 11:57:37 2019 +0200

    ISIS-2086: integrating the new configuration beans with the framework
    
    - rename old IsisConfiguration -> IsisConfigurationLegacy, to make space
    for the new 'IsisConfiguration'
    - moving IDE-support dependency (maven) to module 'config'
---
 core/config/pom.xml                                |   8 +
 .../apache/isis/config/IsisConfigProperties.java   |  62 -----
 .../org/apache/isis/config/IsisConfiguration.java  | 277 +++++----------------
 ...iguration.java => IsisConfigurationLegacy.java} |  10 +-
 .../org/apache/isis/config/internal/_Config.java   |   4 +-
 .../isis/config/internal/_Config_Instance.java     |  10 +-
 .../config/internal/_Config_LifecycleResource.java |   8 +-
 .../isis/config/property/ConfigProperty.java       |   4 +-
 .../config/property/ConfigPropertyAbstract.java    |   4 +-
 .../config/property/ConfigPropertyBoolean.java     |   4 +-
 .../isis/config/property/ConfigPropertyEnum.java   |   4 +-
 .../isis/config/property/ConfigPropertyString.java |   4 +-
 .../config/IsisConfiguration_createSubsetTest.java |  10 +-
 .../config/IsisConfiguration_specialCharTest.java  |   2 +-
 .../config/IsisConfiguration_whitespaceTest.java   |   2 +-
 .../apache/isis/metamodel/MetaModelContext.java    |  17 ++
 .../metamodel/MetaModelContext_forTesting.java     |  11 +-
 .../isis/metamodel/MetaModelContext_usingCDI.java  |   7 +-
 .../metamodel/MetaModelContext_usingSpring.java    |   7 +-
 .../isis/metamodel/ServiceInjector_forTesting.java |   2 +-
 .../adapter/concurrency/ConcurrencyChecking.java   |   4 +-
 .../action/ActionAnnotationFacetFactory.java       |   6 +-
 .../command/CommandActionsConfiguration.java       |   4 +-
 .../command/CommandFacetForActionAnnotation.java   |   4 +-
 ...ctionInvocationFacetForDomainEventAbstract.java |   2 +-
 .../publishing/PublishActionsConfiguration.java    |   4 +-
 .../PublishedActionFacetForActionAnnotation.java   |   4 +-
 .../actions/layout/ActionLayoutFacetFactory.java   |   2 +-
 .../PromptStyleFacetForActionLayoutAnnotation.java |   4 +-
 .../CollectionAnnotationFacetFactory.java          |   2 +-
 .../layout/CollectionLayoutFacetFactory.java       |   2 +-
 ...aultViewFacetForCollectionLayoutAnnotation.java |   4 +-
 .../annotation/SortedByFacetAnnotationFactory.java |   4 +-
 .../facets/fallback/FallbackFacetFactory.java      |   4 +-
 .../metamodel/facets/jaxb/JaxbFacetFactory.java    |   8 +-
 ...assFacetOnActionFromConfiguredRegexFactory.java |   2 +-
 .../annotprop/CssClassFaFacetOnMemberFactory.java  |   2 +-
 .../DisableForContextFacetViaMethodFactory.java    |   2 +-
 .../HideForContextFacetViaMethodFactory.java       |   2 +-
 .../ViewModelSemanticCheckingFacetFactory.java     |   2 +-
 .../object/defaults/DefaultsProviderUtil.java      |   4 +-
 .../DomainObjectAnnotationFacetFactory.java        |  20 +-
 .../auditing/AuditObjectsConfiguration.java        |   4 +-
 .../AuditableFacetForDomainObjectAnnotation.java   |   4 +-
 .../auditing/DefaultViewConfiguration.java         |   4 +-
 .../editing/EditingObjectsConfiguration.java       |   4 +-
 .../ImmutableFacetForDomainObjectAnnotation.java   |   4 +-
 .../publishing/PublishObjectsConfiguration.java    |   4 +-
 ...lishedObjectFacetForDomainObjectAnnotation.java |   4 +-
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |   4 +-
 ...wModelLayoutAnnotationUsingCssClassUiEvent.java |   4 +-
 .../DomainObjectLayoutFacetFactory.java            |  16 +-
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |   4 +-
 ...aViewModelLayoutAnnotationUsingIconUiEvent.java |   4 +-
 ...inObjectLayoutAnnotationUsingLayoutUiEvent.java |   4 +-
 ...iewModelLayoutAnnotationUsingLayoutUiEvent.java |   4 +-
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |   4 +-
 ...ViewModelLayoutAnnotationUsingTitleUiEvent.java |   4 +-
 .../object/encodeable/EncoderDecoderUtil.java      |   4 +-
 .../facets/object/parseable/ParserUtil.java        |   4 +-
 .../promptStyle/PromptStyleConfiguration.java      |   4 +-
 .../ValueSemanticsProviderAndFacetAbstract.java    |   4 +-
 .../value/vsp/ValueSemanticsProviderUtil.java      |   4 +-
 .../property/PropertyAnnotationFacetFactory.java   |   6 +-
 .../command/CommandFacetForPropertyAnnotation.java |   4 +-
 .../command/CommandPropertiesConfiguration.java    |   4 +-
 .../publishing/PublishPropertiesConfiguration.java |   4 +-
 ...ublishedPropertyFacetForPropertyAnnotation.java |   4 +-
 ...romptStyleFacetForPropertyLayoutAnnotation.java |   4 +-
 .../propertylayout/PropertyLayoutFacetFactory.java |   2 +-
 .../DateAndTimeValueSemanticsProviderAbstract.java |   2 +-
 .../ValueSemanticsProviderAbstractTemporal.java    |   2 +-
 .../date/DateValueSemanticsProviderAbstract.java   |   2 +-
 .../Jdk8LocalDateValueSemanticsProvider.java       |   2 +-
 .../JodaLocalDateValueSemanticsProvider.java       |   2 +-
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   |   2 +-
 ...fsetDateTimeValueSemanticsProviderAbstract.java |   2 +-
 ...JodaDateTimeValueSemanticsProviderAbstract.java |   2 +-
 .../JodaLocalDateTimeValueSemanticsProvider.java   |   2 +-
 .../value/money/MoneyValueSemanticsProvider.java   |   2 +-
 .../PercentageValueSemanticsProvider.java          |   2 +-
 .../time/TimeValueSemanticsProviderAbstract.java   |   2 +-
 .../TimeStampValueSemanticsProviderAbstract.java   |   2 +-
 .../isis/metamodel/progmodel/FacetFactorySet.java  |   6 +-
 .../progmodel/ProgrammingModelAbstract.java        |   4 +-
 .../metamodel/services/ServiceInjectorDefault.java |   6 +-
 .../services/registry/ServiceRegistryDefault.java  |   6 +-
 .../services/repository/RepositoryServiceJdo.java  |   4 +-
 .../metamodel/specloader/IntrospectionMode.java    |   2 +-
 .../MetaModelValidatorServiceDefault.java          |   4 +-
 .../specloader/ProgrammingModelServiceDefault.java |   4 +-
 .../metamodel/specloader/ReflectorConstants.java   |   6 +-
 .../metamodel/specloader/ServiceInitializer.java   |   4 +-
 .../specloader/SpecificationLoaderDefault.java     |  11 +-
 .../specloader/specimpl/FacetedMethodsBuilder.java |  13 +-
 .../MetaModelValidatorForDeprecatedAbstract.java   |   6 +-
 .../MetaModelValidatorToCheckModuleExtent.java     |   2 +-
 ...taModelValidatorToCheckObjectSpecIdsUnique.java |   2 +-
 .../org/apache/isis/metamodel/util/EventUtil.java  |   4 +-
 .../metamodel/MetaModelContext_configTest.java     |   6 +-
 .../promptstyle/PromptStyleConfiguration_Test.java |   4 +-
 ...romptStyleFacetFromPropertyAnnotation_Test.java |   4 +-
 .../ImageValueSemanticsProviderAbstractTest.java   |   4 +-
 .../specloader/ServiceInitializerTest.java         |   4 +-
 .../query/JdoQueryAnnotationFacetFactory.java      |   4 +-
 .../jdo/persistence/PersistenceSessionBase.java    |   6 +-
 .../DataNucleusApplicationComponents5.java         |   6 +-
 .../persistence/PersistenceSessionFactory5.java    |   4 +-
 core/pom.xml                                       |  11 -
 .../confmenu/ConfigurationViewServiceDefault.java  |   4 +-
 .../services/email/EmailServiceDefault.java        |   4 +-
 .../isis/webapp/modules/WebModuleContext.java      |   6 +-
 .../modules/h2console/WebModuleH2Console.java      |   4 +-
 .../isis/runtime/system/SystemConstants.java       |   8 +-
 .../isis/runtime/system/context/IsisContext.java   |   6 +-
 .../system/context/session/RuntimeContext.java     |   4 +-
 .../system/context/session/RuntimeContextBase.java |   6 +-
 .../system/internal/IsisLocaleInitializer.java     |   4 +-
 .../system/internal/IsisTimeZoneInitializer.java   |   4 +-
 .../system/persistence/PersistenceSession.java     |   4 +-
 .../system/session/IsisSessionFactoryDefault.java  |   4 +-
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |   4 +-
 .../server/resources/DomainResourceHelper.java     |   4 +-
 .../server/ResourceContextTest_getArg.java         |   4 +-
 ..._ensureCompatibleAcceptHeader_ContractTest.java |   4 +-
 .../wicket/viewer/IsisWicketApplication.java       |  16 +-
 .../settings/WicketViewerSettingsDefault.java      |   4 +-
 .../wicket/model/models/BookmarkedPagesModel.java  |   4 +-
 .../models/whereami/WhereAmIModelDefault.java      |   4 +-
 .../wicket/ui/components/footer/FooterPanel.java   |   4 +-
 .../datepicker/TextFieldWithDateTimePicker.java    |   4 +-
 .../themepicker/IsisWicketThemeSupportDefault.java |   4 +-
 .../widgets/themepicker/ThemeChooser.java          |   4 +-
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |   4 +-
 .../accmngt/AccountManagementPageAbstract.java     |   4 +-
 .../wicket/ui/pages/mmverror/MmvErrorPage.java     |   4 +-
 .../viewer/wicket/ui/panels/PanelAbstract.java     |   4 +-
 .../apache/isis/applib/DomainObjectContainer.java  |   8 +-
 138 files changed, 399 insertions(+), 579 deletions(-)

diff --git a/core/config/pom.xml b/core/config/pom.xml
index 4b03a45..1dca638 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -73,6 +73,14 @@
         	<scope>provided</scope>
         </dependency>
         
+		<!-- IDE support (optional) -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<version>${spring-boot.version}</version>
+			<optional>true</optional>
+		</dependency>
+        
         <!-- TESTS -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfigProperties.java b/core/config/src/main/java/org/apache/isis/config/IsisConfigProperties.java
deleted file mode 100644
index 33ba976..0000000
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfigProperties.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.apache.isis.config;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(ConfigurationConstants.ROOT_PREFIX)
-public class IsisConfigProperties {
-
-    @Getter
-    private final Reflector reflector = new Reflector();
-    public static class Reflector {
-
-        @Getter
-        private final ExplicitAnnotations explicitAnnotations = new ExplicitAnnotations();
-        public static class ExplicitAnnotations {
-
-            /**
-             * Whether or not a public method needs to be annotated with
-             * @{@link org.apache.isis.applib.annotation.Action} in order to be picked up as an action in the metamodel.
-             */
-            @Getter @Setter
-            private boolean action = false;
-        }
-    }
-
-    @Getter
-    private final Services services = new Services();
-    public static class Services {
-
-        @Getter
-        private final Services.Container container = new Services.Container();
-
-        public static class Container {
-
-            /**
-             * Normally any queries are automatically preceded by flushing pending executions.
-             *
-             * <p>
-             * This key allows this behaviour to be disabled.
-             *
-             * <p>
-             *     Originally introduced as part of ISIS-1134 (fixing memory leaks in the objectstore)
-             *     where it was found that the autoflush behaviour was causing a (now unrepeatable)
-             *     data integrity error (see <a href="https://issues.apache.org/jira/browse/ISIS-1134?focusedCommentId=14500638&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14500638">ISIS-1134 comment</a>, in the isis-module-security.
-             *     However, that this could be circumvented by removing the call to flush().
-             *     We don't want to break existing apps that might rely on this behaviour, on the
-             *     other hand we want to fix the memory leak.  Adding this configuration property
-             *     seems the most prudent way forward.
-             * </p>
-             */
-            @Getter @Setter
-            private boolean disableAutoFlush = false;
-
-        }
-    }
-
-    
-}
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 dc4a8e1..85f5fcd 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
@@ -16,230 +16,75 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-
 package org.apache.isis.config;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
+import lombok.Getter;
+import lombok.Setter;
 
-import lombok.val;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
 
 /**
- * Immutable set of properties representing the configuration of the running
- * system.
+ * 
+ * Configuration 'beans' with meta-data (IDE-support).
+ * 
+ * @see <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/configuration-metadata.html">spring.io</a>
+ * @apiNote should ultimately replace {@link IsisConfigurationLegacy}
+ * 
+ * @since 2.0
+ *
  */
-public interface IsisConfiguration {
-
-    //TODO[2112] remove comment    
-    //    /**
-    //     * How to handle the case when the configuration already contains the key being added.
-    //     */
-    //    public enum ContainsPolicy {
-    //        /**
-    //         * If the configuration already contains the key, then ignore the new value.
-    //         */
-    //        IGNORE,
-    //        /**
-    //         * If the configuration already contains the key, then overwrite with the new.
-    //         */
-    //        OVERWRITE,
-    //        /**
-    //         * If the configuration already contains the key, then throw an exception.
-    //         */
-    //        EXCEPTION
-    //    }
-
-
-    // -- VERSION
-
-    public static String getVersion() {
-        return "2.0.0-M3";
+@Configuration
+@ConfigurationProperties(ConfigurationConstants.ROOT_PREFIX)
+public class IsisConfiguration {
+
+    @Getter
+    private final Reflector reflector = new Reflector();
+    public static class Reflector {
+
+        @Getter
+        private final ExplicitAnnotations explicitAnnotations = new ExplicitAnnotations();
+        public static class ExplicitAnnotations {
+
+            /**
+             * Whether or not a public method needs to be annotated with
+             * @{@link org.apache.isis.applib.annotation.Action} in order to be picked up as an action in the metamodel.
+             */
+            @Getter @Setter
+            private boolean action = false;
+        }
     }
 
-    // --
-
-    /**
-     * Creates a copy of this instance, that is a new IsisConfiguration populated 
-     * with a copy of the underlying key/value pairs.
-     *
-     */
-    IsisConfiguration copy();
-
-    /**
-     * Creates a new IsisConfiguration containing the properties starting with
-     * the specified prefix. The names of the new properties will have the
-     * prefixed stripped. This is similar to the {@link #subset(String)}
-     * method, except the property names have their prefixes removed.
-     *
-     * @see #subset(String)
-     */
-    IsisConfiguration subsetWithNamesStripped(String prefix);
-
-    /**
-     * Creates a new IsisConfiguration containing the properties starting with
-     * the specified prefix. The names of the properties in the copy are the
-     * same as in the original, ie the prefix is not removed. This is similar to
-     * the {@link #subsetWithNamesStripped(String)} method except the names of the
-     * properties are not altered when copied.
-     *
-     * @see #subsetWithNamesStripped(String)
-     */
-    IsisConfiguration subset(String withPrefix);
-
-    /**
-     * Gets the boolean value for the specified name where no value or 'on' will
-     * result in true being returned; anything gives false. If no boolean
-     * property is specified with this name then false is returned.
-     *
-     * @param name
-     *            the property name
-     */
-    boolean getBoolean(String name);
-
-    /**
-     * Gets the boolean value for the specified name. If no property is
-     * specified with this name then the specified default boolean value is
-     * returned.
-     *
-     * @param name
-     *            the property name
-     * @param defaultValue
-     *            the value to use as a default
-     */
-    boolean getBoolean(String name, boolean defaultValue);
-
-    /**
-     * Gets the color for the specified name. If no color property is specified
-     * with this name then null is returned.
-     *
-     * @param name
-     *            the property name
-     */
-    Color getColor(String name);
-
-    /**
-     * Gets the color for the specified name. If no color property is specified
-     * with this name then the specified default color is returned.
-     *
-     * @param name
-     *            the property name
-     * @param defaultValue
-     *            the value to use as a default
-     */
-    Color getColor(String name, Color defaultValue);
-
-    /**
-     * Gets the font for the specified name. If no font property is specified
-     * with this name then null is returned.
-     *
-     * @param name
-     *            the property name
-     */
-    Font getFont(String name);
-
-    /**
-     * Gets the font for the specified name. If no font property is specified
-     * with this name then the specified default font is returned.
-     *
-     * @param name
-     *            the property name
-     * @param defaultValue
-     *            the color to use as a default
-     */
-    Font getFont(String name, Font defaultValue);
-
-    /**
-     * Returns a list of entries for the single configuration property with the
-     * specified name.
-     *
-     * <p>
-     * If there is no matching property then returns an empty array.
-     */
-    String[] getList(String name);
-
-    /**
-     * Returns a list of entries for the single configuration property with the
-     * specified name.
-     */
-    String[] getList(String name, String defaultListAsCommaSeparatedArray);
-
-    /**
-     * Gets the number value for the specified name. If no property is specified
-     * with this name then 0 is returned.
-     *
-     * @param name
-     *            the property name
-     */
-    int getInteger(String name);
-
-    /**
-     * Gets the number value for the specified name. If no property is specified
-     * with this name then the specified default number value is returned.
-     *
-     * @param name
-     *            the property name
-     * @param defaultValue
-     *            the value to use as a default
-     */
-    int getInteger(String name, int defaultValue);
-
-    /**
-     * Returns the configuration property with the specified name. If there is
-     * no matching property then null is returned.
-     */
-    String getString(String name);
-
-    String getString(String name, String defaultValue);
-
-    boolean hasProperty(String name);
-
-    boolean isEmpty();
-
-
-    /**
-     * A mutable copy of the current set of properties (name/values) held in this configuration.
-     */
-    Map<String, String> copyToMap();
-
-    /**
-     * pre-bootstrapping configuration
-     */
-    default public IsisSystemEnvironment getEnvironment() {
-        return _Context.getEnvironment();
-    }
-
-    // -- TO STRING
-
-    default public String toStringFormatted() {
-
-        val sb = new StringBuilder();
-        val configuration = this.subset("isis");
-
-        final Map<String, String> map = 
-                ConfigurationConstants.maskIfProtected(configuration.copyToMap(), TreeMap::new);
-
-        String head = String.format("APACHE ISIS %s (%s) ", 
-                IsisConfiguration.getVersion(), getEnvironment().getDeploymentType().name());
-        final int fillCount = 46-head.length();
-        final int fillLeft = fillCount/2;
-        final int fillRight = fillCount-fillLeft;
-        head = _Strings.padStart("", fillLeft, ' ') + head + _Strings.padEnd("", fillRight, ' ');
-
-        sb.append("================================================\n");
-        sb.append("="+head+"=\n");
-        sb.append("================================================\n");
-        map.forEach((k,v)->{
-            sb.append(k+" -> "+v).append("\n");
-        });
-        sb.append("================================================\n");
-
-        return sb.toString();
+    @Getter
+    private final Services services = new Services();
+    public static class Services {
+
+        @Getter
+        private final Services.Container container = new Services.Container();
+
+        public static class Container {
+
+            /**
+             * Normally any queries are automatically preceded by flushing pending executions.
+             *
+             * <p>
+             * This key allows this behaviour to be disabled.
+             *
+             * <p>
+             *     Originally introduced as part of ISIS-1134 (fixing memory leaks in the objectstore)
+             *     where it was found that the autoflush behaviour was causing a (now unrepeatable)
+             *     data integrity error (see <a href="https://issues.apache.org/jira/browse/ISIS-1134?focusedCommentId=14500638&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14500638">ISIS-1134 comment</a>, in the isis-module-security.
+             *     However, that this could be circumvented by removing the call to flush().
+             *     We don't want to break existing apps that might rely on this behaviour, on the
+             *     other hand we want to fix the memory leak.  Adding this configuration property
+             *     seems the most prudent way forward.
+             * </p>
+             */
+            @Getter @Setter
+            private boolean disableAutoFlush = false;
+
+        }
     }
 
+    
 }
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
similarity index 96%
copy from core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
copy to core/config/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
index dc4a8e1..a1976b8 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfigurationLegacy.java
@@ -34,7 +34,7 @@ import lombok.val;
  * Immutable set of properties representing the configuration of the running
  * system.
  */
-public interface IsisConfiguration {
+public interface IsisConfigurationLegacy {
 
     //TODO[2112] remove comment    
     //    /**
@@ -69,7 +69,7 @@ public interface IsisConfiguration {
      * with a copy of the underlying key/value pairs.
      *
      */
-    IsisConfiguration copy();
+    IsisConfigurationLegacy copy();
 
     /**
      * Creates a new IsisConfiguration containing the properties starting with
@@ -79,7 +79,7 @@ public interface IsisConfiguration {
      *
      * @see #subset(String)
      */
-    IsisConfiguration subsetWithNamesStripped(String prefix);
+    IsisConfigurationLegacy subsetWithNamesStripped(String prefix);
 
     /**
      * Creates a new IsisConfiguration containing the properties starting with
@@ -90,7 +90,7 @@ public interface IsisConfiguration {
      *
      * @see #subsetWithNamesStripped(String)
      */
-    IsisConfiguration subset(String withPrefix);
+    IsisConfigurationLegacy subset(String withPrefix);
 
     /**
      * Gets the boolean value for the specified name where no value or 'on' will
@@ -225,7 +225,7 @@ public interface IsisConfiguration {
                 ConfigurationConstants.maskIfProtected(configuration.copyToMap(), TreeMap::new);
 
         String head = String.format("APACHE ISIS %s (%s) ", 
-                IsisConfiguration.getVersion(), getEnvironment().getDeploymentType().name());
+                IsisConfigurationLegacy.getVersion(), getEnvironment().getDeploymentType().name());
         final int fillCount = 46-head.length();
         final int fillLeft = fillCount/2;
         final int fillRight = fillCount-fillLeft;
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config.java b/core/config/src/main/java/org/apache/isis/config/internal/_Config.java
index 8ba7a9c..96bc665 100644
--- a/core/config/src/main/java/org/apache/isis/config/internal/_Config.java
+++ b/core/config/src/main/java/org/apache/isis/config/internal/_Config.java
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 import lombok.val;
 
@@ -33,7 +33,7 @@ public class _Config {
 
     // -- CONFIG ACCESS
 
-    public static IsisConfiguration getConfiguration() {
+    public static IsisConfigurationLegacy getConfiguration() {
         return getLifecycleResource().getConfiguration();
     }
 
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java b/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
index 6cf5b82..4455390 100644
--- a/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
+++ b/core/config/src/main/java/org/apache/isis/config/internal/_Config_Instance.java
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
 import org.apache.isis.commons.internal._Constants;
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 import static org.apache.isis.commons.internal.base._With.computeIfAbsent;
 
@@ -36,7 +36,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.val;
 
 @RequiredArgsConstructor(staticName = "ofProperties")
-final class _Config_Instance implements IsisConfiguration {
+final class _Config_Instance implements IsisConfigurationLegacy {
 
     private final Map<String, String> properties;
     private final Function<String, Boolean> booleanParser;
@@ -125,7 +125,7 @@ final class _Config_Instance implements IsisConfiguration {
     }
 
     @Override
-    public IsisConfiguration copy() {
+    public IsisConfigurationLegacy copy() {
         val copy = _Maps.<String, String>newHashMap();
         properties.forEach(copy::put);
         return new _Config_Instance(copy, 
@@ -137,7 +137,7 @@ final class _Config_Instance implements IsisConfiguration {
     }
 
     @Override
-    public IsisConfiguration subset(@Nullable String withPrefix) {
+    public IsisConfigurationLegacy subset(@Nullable String withPrefix) {
         if(_Strings.isNullOrEmpty(withPrefix)) {
             return copy();
         }
@@ -160,7 +160,7 @@ final class _Config_Instance implements IsisConfiguration {
     }
 
     @Override
-    public IsisConfiguration subsetWithNamesStripped(String withPrefix) {
+    public IsisConfigurationLegacy subsetWithNamesStripped(String withPrefix) {
         if(_Strings.isNullOrEmpty(withPrefix)) {
             return copy();
         }
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java b/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
index d6edce2..de701f5 100644
--- a/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
+++ b/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
@@ -22,7 +22,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 import static org.apache.isis.commons.internal.base._With.requires;
 
@@ -33,7 +33,7 @@ import lombok.extern.log4j.Log4j2;
 class _Config_LifecycleResource {
 
     private final Map<String, String> mutableProperties; 
-    private final _Lazy<IsisConfiguration> configuration;
+    private final _Lazy<IsisConfigurationLegacy> configuration;
 
     _Config_LifecycleResource(final Map<String, String> mutableProperties) {
         requires(mutableProperties, "mutableProperties");
@@ -41,7 +41,7 @@ class _Config_LifecycleResource {
         this.configuration = _Lazy.threadSafe(this::build);
     }
 
-    IsisConfiguration getConfiguration() {
+    IsisConfigurationLegacy getConfiguration() {
         return configuration.get();
     }
 
@@ -57,7 +57,7 @@ class _Config_LifecycleResource {
         return Optional.empty();
     }
 
-    private IsisConfiguration build() {
+    private IsisConfigurationLegacy build() {
 
         // we throw an exception, catch it and keep it for later, to provide
         // causal information, in case the builder is accessed after it already
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java b/core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java
index 7062269..644aa77 100644
--- a/core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java
+++ b/core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java
@@ -20,10 +20,10 @@ package org.apache.isis.config.property;
 
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 public interface ConfigProperty<T> {
-    T from(final IsisConfiguration configuration);
+    T from(final IsisConfigurationLegacy configuration);
 
     Map.Entry<String,String> of(final T value);
 
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java b/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java
index 8637d20..c98abb5 100644
--- a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java
+++ b/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.config.property;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 public abstract class ConfigPropertyAbstract<T> implements ConfigProperty<T> {
     protected final String key;
@@ -28,6 +28,6 @@ public abstract class ConfigPropertyAbstract<T> implements ConfigProperty<T> {
         this.defaultValue = defaultValue;
     }
     @Override
-    public abstract T from(final IsisConfiguration configuration);
+    public abstract T from(final IsisConfigurationLegacy configuration);
 
 }
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java b/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java
index 5a46b28..27b10fd 100644
--- a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java
+++ b/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java
@@ -21,7 +21,7 @@ package org.apache.isis.config.property;
 import java.util.AbstractMap;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 public class ConfigPropertyBoolean extends ConfigPropertyAbstract<Boolean> {
 
@@ -33,7 +33,7 @@ public class ConfigPropertyBoolean extends ConfigPropertyAbstract<Boolean> {
      * @returns not-null
      */
     @Override
-    public Boolean from(final IsisConfiguration configuration) {
+    public Boolean from(final IsisConfigurationLegacy configuration) {
         return configuration.getBoolean(key, defaultValue);
     }
 
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java b/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java
index 37a303b..adec7d6 100644
--- a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java
+++ b/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java
@@ -21,7 +21,7 @@ package org.apache.isis.config.property;
 import java.util.AbstractMap;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 public class ConfigPropertyEnum<E extends Enum<E>> extends
 ConfigPropertyAbstract<E> {
@@ -29,7 +29,7 @@ ConfigPropertyAbstract<E> {
         super(key, defaultValue);
     }
     @Override
-    public E from(final IsisConfiguration configuration) {
+    public E from(final IsisConfigurationLegacy configuration) {
         return Enum.valueOf(defaultValue.getDeclaringClass(), configuration.getString(key, defaultValue.name()).toUpperCase());
     }
 
diff --git a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java b/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java
index 0d7120b..ad331df 100644
--- a/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java
+++ b/core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java
@@ -21,14 +21,14 @@ package org.apache.isis.config.property;
 import java.util.AbstractMap;
 import java.util.Map;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 public class ConfigPropertyString extends ConfigPropertyAbstract<String> {
     public ConfigPropertyString(final String key, final String defaultValue) {
         super(key, defaultValue);
     }
     @Override
-    public String from(final IsisConfiguration configuration) {
+    public String from(final IsisConfigurationLegacy configuration) {
         return configuration.getString(key, defaultValue);
     }
 
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
index 94993e9..0c38ce5 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
@@ -39,7 +39,7 @@ class IsisConfiguration_createSubsetTest {
 
         val configuration = _Config.getConfiguration();
 
-        final IsisConfiguration subset = configuration.subsetWithNamesStripped("foo");
+        final IsisConfigurationLegacy subset = configuration.subsetWithNamesStripped("foo");
         assertEquals(true, subset.isEmpty());
     }
 
@@ -50,7 +50,7 @@ class IsisConfiguration_createSubsetTest {
 
         val configuration = _Config.getConfiguration();
 
-        final IsisConfiguration subset = configuration.subsetWithNamesStripped("foo");
+        final IsisConfigurationLegacy subset = configuration.subsetWithNamesStripped("foo");
         assertEquals(true, subset.isEmpty());
     }
 
@@ -61,7 +61,7 @@ class IsisConfiguration_createSubsetTest {
 
         val configuration = _Config.getConfiguration();
 
-        final IsisConfiguration subset = configuration.subsetWithNamesStripped("foo");
+        final IsisConfigurationLegacy subset = configuration.subsetWithNamesStripped("foo");
         assertEquals(true, subset.isEmpty());
     }
 
@@ -72,7 +72,7 @@ class IsisConfiguration_createSubsetTest {
 
         val configuration = _Config.getConfiguration();
 
-        final IsisConfiguration subset = configuration.subsetWithNamesStripped("foo");
+        final IsisConfigurationLegacy subset = configuration.subsetWithNamesStripped("foo");
 
         assertEquals(1, subset.copyToMap().size());
         assertEquals("fozValue", subset.getString("foz"));
@@ -86,7 +86,7 @@ class IsisConfiguration_createSubsetTest {
 
         val configuration = _Config.getConfiguration();
 
-        final IsisConfiguration subset = configuration.subsetWithNamesStripped("foo");
+        final IsisConfigurationLegacy subset = configuration.subsetWithNamesStripped("foo");
 
         assertEquals("fozValue", subset.getString("foz"));
         assertEquals("fazValue", subset.getString("faz"));
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
index 3487a0c..4826180 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class IsisConfiguration_specialCharTest {
 
-    IsisConfiguration configuration;
+    IsisConfigurationLegacy configuration;
 
     private final static String specialCharString =
             "jdbc:sqlserver://HALCHILLBLAST;instance=.;databaseName=estatio";
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
index d6cedf9..536af18 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class IsisConfiguration_whitespaceTest {
 
-    IsisConfiguration configuration;
+    IsisConfigurationLegacy configuration;
 
     @BeforeEach
     void setUp() throws Exception {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext.java
index d7425d2..9c92b7a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.applib.services.xactn.TransactionState;
 import org.apache.isis.commons.internal.context._Context;
 import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.MetaModelContext_forTesting.MetaModelContext_forTestingBuilder;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
@@ -49,6 +50,16 @@ public interface MetaModelContext {
 
     // -- INTERFACE
 
+    IsisConfigurationLegacy getConfigurationLegacy();
+    
+    /**
+     * 
+     * Configuration 'beans' with meta-data (IDE-support).
+     * 
+     * @see <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/configuration-metadata.html">spring.io</a>
+     * @apiNote should ultimately replace {@link #getConfigurationLegacy()}
+     * 
+     */
     IsisConfiguration getConfiguration();
 
     ObjectAdapterProvider getObjectAdapterProvider();
@@ -108,6 +119,11 @@ public interface MetaModelContext {
         public MetaModelContext getMetaModelContext();
 
         @Override
+        public default IsisConfigurationLegacy getConfigurationLegacy() {
+            return getMetaModelContext().getConfigurationLegacy();
+        }
+        
+        @Override
         public default IsisConfiguration getConfiguration() {
             return getMetaModelContext().getConfiguration();
         }
@@ -198,5 +214,6 @@ public interface MetaModelContext {
         }
 
     }
+    
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
index f3cd191..5aa3873 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
@@ -31,7 +31,9 @@ import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.applib.services.xactn.TransactionState;
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
@@ -98,11 +100,16 @@ final class MetaModelContext_forTesting implements MetaModelContext {
     }
 
     @Override
-    public IsisConfiguration getConfiguration() {
+    public IsisConfigurationLegacy getConfigurationLegacy() {
         return _Config.getConfiguration();
     }
 
     @Override
+    public IsisConfiguration getConfiguration() {
+        throw _Exceptions.notImplemented(); //TODO[2086] needs test integration, for legacy tests that don't use a Spring context  
+    }
+    
+    @Override
     public Stream<ObjectAdapter> streamServiceAdapters() {
 
         if(serviceAdaptersById==null) {
@@ -122,7 +129,7 @@ final class MetaModelContext_forTesting implements MetaModelContext {
     public Stream<Object> streamSingletons() {
 
         val fields = _Lists.of(
-                getConfiguration(),
+                getConfigurationLegacy(),
                 objectAdapterProvider,
                 serviceInjector,
                 serviceRegistry,
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingCDI.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingCDI.java
index 9eb19f7..ce917d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingCDI.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingCDI.java
@@ -35,6 +35,7 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.commons.internal.ioc.BeanSort;
 import org.apache.isis.commons.internal.ioc.cdi._CDI;
 import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
@@ -54,10 +55,14 @@ import lombok.val;
 class MetaModelContext_usingCDI implements MetaModelContext {
 
     @Getter(lazy=true) 
-    private final IsisConfiguration configuration = 
+    private final IsisConfigurationLegacy configurationLegacy = 
     _Config.getConfiguration();
 
     @Getter(lazy=true) 
+    private final IsisConfiguration configuration = 
+    _CDI.getSingletonElseFail(IsisConfiguration.class);
+    
+    @Getter(lazy=true) 
     private final ObjectAdapterProvider objectAdapterProvider =
     _CDI.getSingletonElseFail(ObjectAdapterProvider.class);
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingSpring.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingSpring.java
index e303854..03a86dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingSpring.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingSpring.java
@@ -34,6 +34,7 @@ import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.commons.internal.ioc.spring._Spring;
 import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
@@ -54,10 +55,14 @@ import lombok.val;
 class MetaModelContext_usingSpring implements MetaModelContext {
 
     @Getter(lazy=true) 
-    private final IsisConfiguration configuration = 
+    private final IsisConfigurationLegacy configurationLegacy = 
     _Config.getConfiguration();
 
     @Getter(lazy=true) 
+    private final IsisConfiguration configuration = 
+    _Spring.getSingletonElseFail(IsisConfiguration.class);
+
+    @Getter(lazy=true) 
     private final ObjectAdapterProvider objectAdapterProvider =
     _Spring.getSingletonElseFail(PersistenceSessionServiceInternal.class);
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
index a361087..285f926 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
@@ -47,7 +47,7 @@ class ServiceInjector_forTesting implements ServiceInjector {
 
             val mmcb = (MetaModelContext_forTesting) mmc;
 
-            val configuration = requireNonNull(mmcb.getConfiguration());
+            val configuration = requireNonNull(mmcb.getConfigurationLegacy());
             val serviceRegistry = requireNonNull(mmcb.getServiceRegistry());
             val injectorMethodEvaluator = new InjectorMethodEvaluatorDefault();
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/concurrency/ConcurrencyChecking.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/concurrency/ConcurrencyChecking.java
index 00072ab..b146f18 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/concurrency/ConcurrencyChecking.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/concurrency/ConcurrencyChecking.java
@@ -23,14 +23,14 @@ import java.util.concurrent.Callable;
 
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 @Deprecated //TODO[2154] remove
 enum ConcurrencyChecking {
     NO_CHECK,
     CHECK;
 
-    public static boolean isGloballyDisabled(IsisConfiguration configuration) {
+    public static boolean isGloballyDisabled(IsisConfigurationLegacy configuration) {
         final boolean concurrencyCheckingGloballyDisabled =
                 configuration.getBoolean("isis.persistor.disableConcurrencyChecking", false);
         return concurrencyCheckingGloballyDisabled;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index f7a9ea6..874721c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -120,7 +120,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract {
                     actionDomainEventFacet.getEventType(),
                     ActionDomainEvent.Noop.class,
                     ActionDomainEvent.Default.class,
-                    "isis.reflector.facet.actionAnnotation.domainEvent.postForDefault", getConfiguration())) {
+                    "isis.reflector.facet.actionAnnotation.domainEvent.postForDefault", getConfigurationLegacy())) {
                 FacetUtil.addFacet(actionDomainEventFacet);
             }
 
@@ -210,7 +210,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract {
         }
 
         // check for @Action(command=...)
-        CommandFacet commandFacet = CommandFacetForActionAnnotation.create(actions, getConfiguration(), getServiceInjector(), holder);
+        CommandFacet commandFacet = CommandFacetForActionAnnotation.create(actions, getConfigurationLegacy(), getServiceInjector(), holder);
 
         FacetUtil.addFacet(commandFacet);
     }
@@ -232,7 +232,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract {
         }
 
         // check for @Action(publishing=...)
-        PublishedActionFacet facet = PublishedActionFacetForActionAnnotation.create(actions, getConfiguration(), holder);
+        PublishedActionFacet facet = PublishedActionFacetForActionAnnotation.create(actions, getConfigurationLegacy(), holder);
 
         FacetUtil.addFacet(facet);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
index 09ae346..c5bfa3f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.facets.actions.action.command;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.domainobject.Util;
 
 public enum CommandActionsConfiguration {
@@ -28,7 +28,7 @@ public enum CommandActionsConfiguration {
 
     private static final String  COMMAND_ACTIONS_KEY = "isis.services.command.actions";
 
-    public static CommandActionsConfiguration parse(final IsisConfiguration configuration) {
+    public static CommandActionsConfiguration parse(final IsisConfigurationLegacy configuration) {
         return parse(configuration.getString(COMMAND_ACTIONS_KEY));
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
index f487bc9..37c857c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.CommandPersistence;
 import org.apache.isis.applib.annotation.CommandReification;
 import org.apache.isis.applib.services.command.CommandDtoProcessor;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
 import org.apache.isis.metamodel.facets.actions.command.CommandFacetAbstract;
@@ -36,7 +36,7 @@ public class CommandFacetForActionAnnotation extends CommandFacetAbstract {
 
     public static CommandFacet create(
             final List<Action> actions,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final ServiceInjector servicesInjector,
             final FacetHolder holder) {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 75f395a..faa90f2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -435,7 +435,7 @@ implements ImperativeFacet {
             return null;
         }
 
-        final boolean filterForVisibility = getConfiguration().getBoolean("isis.reflector.facet.filterVisibility", true);
+        final boolean filterForVisibility = getConfigurationLegacy().getBoolean("isis.reflector.facet.filterVisibility", true);
         if (!filterForVisibility) {
             return resultAdapter;
         }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
index 3b0bd99..721d1fe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.facets.actions.action.publishing;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.domainobject.Util;
 
 public enum PublishActionsConfiguration {
@@ -28,7 +28,7 @@ public enum PublishActionsConfiguration {
 
     private static final String PUBLISH_ACTIONS_KEY = "isis.services.publish.actions";
 
-    public static PublishActionsConfiguration parse(IsisConfiguration configuration) {
+    public static PublishActionsConfiguration parse(IsisConfigurationLegacy configuration) {
         final String configuredValue = configuration.getString(PUBLISH_ACTIONS_KEY);
         return PublishActionsConfiguration.parse(configuredValue);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
index 86981d9..90c967d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
 import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacetAbstract;
@@ -33,7 +33,7 @@ public class PublishedActionFacetForActionAnnotation extends PublishedActionFace
 
     public static PublishedActionFacet create(
             final List<Action> actions,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder) {
 
         final PublishActionsConfiguration setting = PublishActionsConfiguration.parse(configuration);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index 278b068..ca5de61 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -89,7 +89,7 @@ public class ActionLayoutFacetFactory extends FacetFactoryAbstract implements Co
 
         // promptStyle
         PromptStyleFacet promptStyleFacet = PromptStyleFacetForActionLayoutAnnotation
-                .create(actionLayouts, getConfiguration(), holder);
+                .create(actionLayouts, getConfigurationLegacy(), holder);
 
         FacetUtil.addFacet(promptStyleFacet);
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
index a59d2cc..2a7aa2d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.apache.isis.applib.annotation.ActionLayout;
 import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleConfiguration;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet;
@@ -42,7 +42,7 @@ public class PromptStyleFacetForActionLayoutAnnotation extends PromptStyleFacetA
 
     public static PromptStyleFacet create(
             final List<ActionLayout> actionLayouts,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder) {
 
         return actionLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index faa0993..1926859 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -119,7 +119,7 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract {
                 collectionDomainEventFacet.getEventType(),
                 CollectionDomainEvent.Noop.class,
                 CollectionDomainEvent.Default.class,
-                "isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault", getConfiguration())) {
+                "isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault", getConfigurationLegacy())) {
             FacetUtil.addFacet(collectionDomainEventFacet);
         }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
index 89f674b..229230f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
@@ -68,7 +68,7 @@ public class CollectionLayoutFacetFactory extends FacetFactoryAbstract implement
 
         // defaultView
         DefaultViewFacet defaultViewFacet =
-                DefaultViewFacetForCollectionLayoutAnnotation.create(collectionLayouts, getConfiguration(), holder);
+                DefaultViewFacetForCollectionLayoutAnnotation.create(collectionLayouts, getConfigurationLegacy(), holder);
         FacetUtil.addFacet(defaultViewFacet);
 
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
index 4b3277c..1483d57 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.apache.isis.applib.annotation.CollectionLayout;
 import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
 import org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
@@ -37,7 +37,7 @@ public class DefaultViewFacetForCollectionLayoutAnnotation extends DefaultViewFa
 
     public static DefaultViewFacet create(
             final List<CollectionLayout> collectionLayouts,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder) {
 
         final String defaultView = collectionLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
index a9a4243..16a6604 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets.collections.sortedby.annotation;
 import java.util.Comparator;
 import java.util.stream.Stream;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facetapi.MetaModelValidatorRefiner;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
@@ -37,7 +37,7 @@ import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
 
 /**
  * There is no check that the value is a {@link Comparator}; instead this is done through
- * the {@link #refineMetaModelValidator(MetaModelValidatorComposite, IsisConfiguration)}.
+ * the {@link #refineMetaModelValidator(MetaModelValidatorComposite, IsisConfigurationLegacy)}.
  */
 public class SortedByFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
index 64b391c..f072a73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -155,13 +155,13 @@ public class FallbackFacetFactory extends FacetFactoryAbstract {
     }
 
     private int getPagedConfigSetting(final String subkey, final int defaultValue) {
-        return getConfiguration().getInteger("isis.viewers.paged." + subkey, defaultValue);
+        return getConfigurationLegacy().getInteger("isis.viewers.paged." + subkey, defaultValue);
     }
 
     private String getPropParamLayoutConfigSetting(final String layout, String... subkeys) {
         for (String subkey : subkeys) {
             final String layoutKey = "isis.viewers." + layout + "." + subkey;
-            final String value = getConfiguration().getString(layoutKey);
+            final String value = getConfigurationLegacy().getString(layoutKey);
             if(value != null) {
                 return value;
             }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
index 7771dcf..7687a7d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
@@ -171,7 +171,7 @@ implements MetaModelValidatorRefiner {
     @Override
     public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator) {
 
-        final IsisConfiguration configuration = _Config.getConfiguration(); 
+        final IsisConfigurationLegacy configuration = _Config.getConfiguration(); 
         final List<TypeValidator> typeValidators = getTypeValidators(configuration);
         final List<PropertyValidator> propertyValidators = getPropertyValidators(configuration);
 
@@ -221,7 +221,7 @@ implements MetaModelValidatorRefiner {
         metaModelValidator.add(validator);
     }
 
-    private List<TypeValidator> getTypeValidators(final IsisConfiguration configuration) {
+    private List<TypeValidator> getTypeValidators(final IsisConfigurationLegacy configuration) {
 
         final List<TypeValidator> typeValidators = _Lists.newArrayList();
         if(configuration.getBoolean(ISIS_REFLECTOR_VALIDATOR_JAXB_VIEW_MODEL_NOT_ABSTRACT, ISIS_REFLECTOR_VALIDATOR_JAXB_VIEW_MODEL_NOT_ABSTRACT_DEFAULT)) {
@@ -236,7 +236,7 @@ implements MetaModelValidatorRefiner {
         return typeValidators;
     }
 
-    private List<PropertyValidator> getPropertyValidators(final IsisConfiguration configuration) {
+    private List<PropertyValidator> getPropertyValidators(final IsisConfigurationLegacy configuration) {
         final List<PropertyValidator> propertyValidators = _Lists.newArrayList();
         if(configuration.getBoolean(ISIS_REFLECTOR_VALIDATOR_JAXB_VIEW_MODEL_REFERENCE_TYPE_ADAPTER, ISIS_REFLECTOR_VALIDATOR_JAXB_VIEW_MODEL_REFERENCE_TYPE_ADAPTER_DEFAULT)) {
             propertyValidators.add(new PropertyValidatorForReferenceTypes());
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
index d353325..8fa9653 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
@@ -119,7 +119,7 @@ public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactor
     private Map<Pattern, String> getCssClassByPattern() {
         if (cssClassByPattern == null) {
             // build lazily
-            final String cssClassPatterns = getConfiguration().getString("isis.reflector.facet.cssClass.patterns");
+            final String cssClassPatterns = getConfigurationLegacy().getString("isis.reflector.facet.cssClass.patterns");
             this.cssClassByPattern = buildCssClassByPattern(cssClassPatterns);
         }
         return cssClassByPattern;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
index 80e8f9d..284bf44 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
@@ -101,7 +101,7 @@ public class CssClassFaFacetOnMemberFactory extends FacetFactoryAbstract impleme
     private Map<Pattern, String> getFaIconByPattern() {
         if (faIconByPattern == null) {
             // build lazily
-            final String cssClassFaPatterns = getConfiguration().getString("isis.reflector.facet.cssClassFa.patterns");
+            final String cssClassFaPatterns = getConfigurationLegacy().getString("isis.reflector.facet.cssClassFa.patterns");
             this.faIconByPattern = buildFaIconByPattern(cssClassFaPatterns);
         }
         return faIconByPattern;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
index 0693dcd..2b1f791 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
@@ -64,7 +64,7 @@ public class DisableForContextFacetViaMethodFactory extends MethodPrefixBasedFac
 
         Method disableMethod = null;
 
-        boolean noParamsOnly = getConfiguration().getBoolean(
+        boolean noParamsOnly = getConfigurationLegacy().getBoolean(
                 ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_KEY,
                 ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_DEFAULT);
         boolean searchExactMatch = !noParamsOnly;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
index 0e64628..49c826a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
@@ -62,7 +62,7 @@ public class HideForContextFacetViaMethodFactory extends MethodPrefixBasedFacetF
         Method hideMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodLiteralConstants.HIDE_PREFIX + capitalizedName, boolean.class, new Class[] {});
         if (hideMethod == null) {
 
-            boolean noParamsOnly = getConfiguration().getBoolean(
+            boolean noParamsOnly = getConfigurationLegacy().getBoolean(
                     ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_KEY,
                     ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_DEFAULT);
             boolean searchExactMatch = !noParamsOnly;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
index 3dc58af..69a3533 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
@@ -48,7 +48,7 @@ public class ViewModelSemanticCheckingFacetFactory extends FacetFactoryAbstract
     public void process(final ProcessClassContext processClassContext) {
 
         // disable by default
-        final boolean enable = getConfiguration()
+        final boolean enable = getConfigurationLegacy()
                 .getBoolean(
                         ConfigurationConstants.Keys.Reflector.viewModelSemanticCheckingFacetFactoryEnable,
                         false);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
index d11cbd8..4f63145 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.defaults;
 
 import org.apache.isis.applib.adapters.DefaultsProvider;
 import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -36,7 +36,7 @@ public final class DefaultsProviderUtil {
 
     public static String defaultsProviderNameFromConfiguration(final Class<?> type) {
 
-        final IsisConfiguration configuration = _Config.getConfiguration();
+        final IsisConfigurationLegacy configuration = _Config.getConfiguration();
 
         final String key = DEFAULTS_PROVIDER_NAME_KEY_PREFIX + type.getCanonicalName() + DEFAULTS_PROVIDER_NAME_KEY_SUFFIX;
         final String defaultsProviderName = configuration.getString(key);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index dad8168..b667cd2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -137,7 +137,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
 
         // check for @DomainObject(auditing=....)
         AuditableFacet auditableFacet = AuditableFacetForDomainObjectAnnotation
-                .create(domainObjects, getConfiguration(), holder);
+                .create(domainObjects, getConfigurationLegacy(), holder);
 
         // then add
         FacetUtil.addFacet(auditableFacet);
@@ -160,7 +160,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
 
         // check from @DomainObject(publishing=...)
         PublishedObjectFacet publishedObjectFacet = PublishedObjectFacetForDomainObjectAnnotation
-                .create(domainObjects, getConfiguration(), facetHolder);
+                .create(domainObjects, getConfigurationLegacy(), facetHolder);
 
         // then add
         FacetUtil.addFacet(publishedObjectFacet);
@@ -247,7 +247,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
 
         // check from @DomainObject(editing=...)
         ImmutableFacet facet = ImmutableFacetForDomainObjectAnnotation
-                .create(domainObjects, getConfiguration(), facetHolder);
+                .create(domainObjects, getConfigurationLegacy(), facetHolder);
 
         // then add
         FacetUtil.addFacet(facet);
@@ -351,7 +351,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
                 ObjectCreatedEvent.Noop.class,
                 ObjectCreatedEvent.Default.class,
                 "isis.reflector.facet.domainObjectAnnotation.createdLifecycleEvent.postForDefault",
-                getConfiguration())
+                getConfigurationLegacy())
                 )
         .findFirst()
         .map(lifecycleEvent -> new CreatedLifecycleEventFacetForDomainObjectAnnotation(
@@ -369,7 +369,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
                 ObjectLoadedEvent.Noop.class,
                 ObjectLoadedEvent.Default.class,
                 "isis.reflector.facet.domainObjectAnnotation.loadedLifecycleEvent.postForDefault",
-                getConfiguration())
+                getConfigurationLegacy())
                 )
         .findFirst()
         .map(lifecycleEvent -> new LoadedLifecycleEventFacetForDomainObjectAnnotation(
@@ -387,7 +387,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
                 ObjectPersistingEvent.Noop.class,
                 ObjectPersistingEvent.Default.class,
                 "isis.reflector.facet.domainObjectAnnotation.persistingLifecycleEvent.postForDefault",
-                getConfiguration())
+                getConfigurationLegacy())
                 )
         .findFirst()
         .map(lifecycleEvent -> new PersistingLifecycleEventFacetForDomainObjectAnnotation(
@@ -405,7 +405,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
                 ObjectPersistedEvent.Noop.class,
                 ObjectPersistedEvent.Default.class,
                 "isis.reflector.facet.domainObjectAnnotation.persistedLifecycleEvent.postForDefault",
-                getConfiguration())
+                getConfigurationLegacy())
                 )
         .findFirst()
         .map(lifecycleEvent -> new PersistedLifecycleEventFacetForDomainObjectAnnotation(
@@ -423,7 +423,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
                 ObjectRemovingEvent.Noop.class,
                 ObjectRemovingEvent.Default.class,
                 "isis.reflector.facet.domainObjectAnnotation.removingLifecycleEvent.postForDefault",
-                getConfiguration())
+                getConfigurationLegacy())
                 )
         .findFirst()
         .map(lifecycleEvent -> new RemovingLifecycleEventFacetForDomainObjectAnnotation(
@@ -441,7 +441,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
                 ObjectUpdatedEvent.Noop.class,
                 ObjectUpdatedEvent.Default.class,
                 "isis.reflector.facet.domainObjectAnnotation.updatedLifecycleEvent.postForDefault",
-                getConfiguration())
+                getConfigurationLegacy())
                 )
         .findFirst()
         .map(lifecycleEvent -> new UpdatedLifecycleEventFacetForDomainObjectAnnotation(
@@ -459,7 +459,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
                 ObjectUpdatingEvent.Noop.class,
                 ObjectUpdatingEvent.Default.class,
                 "isis.reflector.facet.domainObjectAnnotation.updatingLifecycleEvent.postForDefault",
-                getConfiguration())
+                getConfigurationLegacy())
                 )
         .findFirst()
         .map(lifecycleEvent -> new UpdatingLifecycleEventFacetForDomainObjectAnnotation(
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
index 8f6fa4a..cdb4ba8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.facets.object.domainobject.auditing;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.domainobject.Util;
 
 public enum AuditObjectsConfiguration {
@@ -27,7 +27,7 @@ public enum AuditObjectsConfiguration {
 
     private static final String AUDIT_OBJECTS_KEY = "isis.services.audit.objects";
 
-    public static AuditObjectsConfiguration parse(IsisConfiguration configuration) {
+    public static AuditObjectsConfiguration parse(IsisConfigurationLegacy configuration) {
         final String configuredValue = configuration.getString(AUDIT_OBJECTS_KEY);
         return AuditObjectsConfiguration.parse(configuredValue);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
index 1da6f6e..35ebcee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.isis.applib.annotation.Auditing;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
 import org.apache.isis.metamodel.facets.object.audit.AuditableFacetAbstract;
@@ -34,7 +34,7 @@ public class AuditableFacetForDomainObjectAnnotation extends AuditableFacetAbstr
 
     public static AuditableFacet create(
             final List<DomainObject> domainObjects,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder) {
 
         return domainObjects
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
index e453318..fe969f2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.facets.object.domainobject.auditing;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 public enum DefaultViewConfiguration {
     HIDDEN("hidden"),
@@ -38,7 +38,7 @@ public enum DefaultViewConfiguration {
         return defaultView;
     }
 
-    public static DefaultViewConfiguration parse(IsisConfiguration configuration) {
+    public static DefaultViewConfiguration parse(IsisConfigurationLegacy configuration) {
         final String configuredValue = configuration.getString(DEFAULT_VIEW_KEY);
         return DefaultViewConfiguration.parseValue(configuredValue);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
index 20927aa..296f779 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.facets.object.domainobject.editing;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.domainobject.Util;
 
 public enum EditingObjectsConfiguration {
@@ -27,7 +27,7 @@ public enum EditingObjectsConfiguration {
 
     public static final String EDIT_OBJECTS_KEY = "isis.objects.editing";
 
-    public static EditingObjectsConfiguration parse(final IsisConfiguration configuration) {
+    public static EditingObjectsConfiguration parse(final IsisConfigurationLegacy configuration) {
         final String configuredValue = configuration.getString(EDIT_OBJECTS_KEY);
         return EditingObjectsConfiguration.parse(configuredValue);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index d52e0e8..79f80ae 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.Editing;
 import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetUtil;
@@ -39,7 +39,7 @@ public class ImmutableFacetForDomainObjectAnnotation extends ImmutableFacetAbstr
 
     public static ImmutableFacet create(
             final List<DomainObject> domainObjects,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder) {
 
         final EditingObjectsConfiguration setting = EditingObjectsConfiguration.parse(configuration);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
index 9fde167..bec5985 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.facets.object.domainobject.publishing;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.domainobject.Util;
 
 public enum PublishObjectsConfiguration {
@@ -27,7 +27,7 @@ public enum PublishObjectsConfiguration {
 
     private static final String PUBLISH_OBJECTS_KEY = "isis.services.publish.objects";
 
-    public static PublishObjectsConfiguration parse(IsisConfiguration configuration) {
+    public static PublishObjectsConfiguration parse(IsisConfigurationLegacy configuration) {
         final String configuredValue = configuration.getString(PUBLISH_OBJECTS_KEY);
         return PublishObjectsConfiguration.parse(configuredValue);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
index bd7f91e..c8f86d5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.Publishing;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet;
 import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
@@ -33,7 +33,7 @@ public class PublishedObjectFacetForDomainObjectAnnotation extends PublishedObje
 
     public static PublishedObjectFacet create(
             final List<DomainObject> domainObjects,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder) {
 
         final PublishObjectsConfiguration setting = PublishObjectsConfiguration.parse(configuration);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index 68337db..b5fce82 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.CssClassUiEvent;
 import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -43,7 +43,7 @@ implements CssClassFacet {
     public static Facet create(
             final List<DomainObjectLayout> domainObjectLayouts,
             final MetamodelEventService metamodelEventService,
-            final IsisConfiguration configuration, 
+            final IsisConfigurationLegacy configuration, 
             final FacetHolder facetHolder) {
 
         return domainObjectLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
index 768e03d..f207761 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.CssClassUiEvent;
 import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -42,7 +42,7 @@ CssClassFacet {
     public static Facet create(
             final List<ViewModelLayout> viewModelLayouts,
             final MetamodelEventService metamodelEventService,
-            final IsisConfiguration configuration, 
+            final IsisConfigurationLegacy configuration, 
             final FacetHolder facetHolder) {
 
         return viewModelLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
index b888837..9263f92 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
@@ -49,31 +49,31 @@ public class DomainObjectLayoutFacetFactory extends FacetFactoryAbstract {
 
         FacetUtil.addFacet(
                 TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.create(
-                        domainObjectLayouts, metamodelEventService, getConfiguration(), facetHolder));
+                        domainObjectLayouts, metamodelEventService, getConfigurationLegacy(), facetHolder));
         FacetUtil.addFacet(
                 TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.create(
-                        viewModelLayouts, metamodelEventService, getConfiguration(), facetHolder));
+                        viewModelLayouts, metamodelEventService, getConfigurationLegacy(), facetHolder));
 
         FacetUtil.addFacet(
                 IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.create(
-                        domainObjectLayouts, metamodelEventService, getConfiguration(), facetHolder));
+                        domainObjectLayouts, metamodelEventService, getConfigurationLegacy(), facetHolder));
         FacetUtil.addFacet(
                 IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.create(
-                        viewModelLayouts, metamodelEventService, getConfiguration(), facetHolder));
+                        viewModelLayouts, metamodelEventService, getConfigurationLegacy(), facetHolder));
 
         FacetUtil.addFacet(
                 CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.create(
-                        domainObjectLayouts, metamodelEventService, getConfiguration(), facetHolder));
+                        domainObjectLayouts, metamodelEventService, getConfigurationLegacy(), facetHolder));
         FacetUtil.addFacet(
                 CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.create(
-                        viewModelLayouts, metamodelEventService, getConfiguration(), facetHolder));
+                        viewModelLayouts, metamodelEventService, getConfigurationLegacy(), facetHolder));
 
         FacetUtil.addFacet(
                 LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.create(
-                        domainObjectLayouts, metamodelEventService, getConfiguration(), facetHolder));
+                        domainObjectLayouts, metamodelEventService, getConfigurationLegacy(), facetHolder));
         FacetUtil.addFacet(
                 LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.create(
-                        viewModelLayouts, metamodelEventService, getConfiguration(), facetHolder));
+                        viewModelLayouts, metamodelEventService, getConfigurationLegacy(), facetHolder));
 
         FacetUtil.addFacet(
                 CssClassFacetForDomainObjectLayoutAnnotation.create(domainObjectLayouts, facetHolder));
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index ef3bf77..22c3bce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.IconUiEvent;
 import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.icon.IconFacet;
@@ -40,7 +40,7 @@ public class IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent extends Ic
     public static Facet create(
             final List<DomainObjectLayout> domainObjectLayouts,
             final MetamodelEventService metamodelEventService,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder facetHolder) {
 
         return domainObjectLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
index c6d0007..ce9a1d8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.IconUiEvent;
 import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.icon.IconFacet;
@@ -40,7 +40,7 @@ public class IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent extends IconF
     public static Facet create(
             final List<ViewModelLayout> viewModelLayouts,
             final MetamodelEventService metamodelEventService,
-            final IsisConfiguration configuration, 
+            final IsisConfigurationLegacy configuration, 
             final FacetHolder facetHolder) {
 
         return viewModelLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
index 777cdea..921d105 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.events.ui.LayoutUiEvent;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.layout.LayoutFacet;
@@ -41,7 +41,7 @@ implements LayoutFacet {
     public static Facet create(
             final List<DomainObjectLayout> domainObjectLayouts,
             final MetamodelEventService metamodelEventService,
-            final IsisConfiguration configuration, 
+            final IsisConfigurationLegacy configuration, 
             final FacetHolder facetHolder) {
 
         return domainObjectLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
index 8a05a94..6bd8c9f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.annotation.ViewModelLayout;
 import org.apache.isis.applib.events.ui.LayoutUiEvent;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.layout.LayoutFacet;
@@ -41,7 +41,7 @@ implements LayoutFacet {
     public static Facet create(
             final List<ViewModelLayout> viewModelLayouts,
             final MetamodelEventService metamodelEventService,
-            final IsisConfiguration configuration, 
+            final IsisConfigurationLegacy configuration, 
             final FacetHolder facetHolder) {
 
         return viewModelLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index df81470..d659db4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.events.ui.TitleUiEvent;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.title.TitleFacet;
@@ -43,7 +43,7 @@ public class TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent extends
     public static Facet create(
             final List<DomainObjectLayout> domainObjectLayouts,
             final MetamodelEventService metamodelEventService,
-            final IsisConfiguration configuration, 
+            final IsisConfigurationLegacy configuration, 
             final FacetHolder facetHolder) {
 
         return domainObjectLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
index c222dd1..977fcd9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.events.ui.TitleUiEvent;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.title.TitleFacet;
@@ -43,7 +43,7 @@ public class TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent extends Tit
     public static Facet create(
             final List<ViewModelLayout> viewModelLayouts,
             final MetamodelEventService metamodelEventService,
-            final IsisConfiguration configuration, 
+            final IsisConfigurationLegacy configuration, 
             final FacetHolder facetHolder) {
 
         return viewModelLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
index a3c5e04..75f125a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.encodeable;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
@@ -33,7 +33,7 @@ public final class EncoderDecoderUtil {
     public static final String ENCODER_DECODER_NAME_KEY_PREFIX = "isis.reflector.java.facets.encoderDecoder.";
     public static final String ENCODER_DECODER_NAME_KEY_SUFFIX = ".encoderDecoderName";
 
-    public static String encoderDecoderNameFromConfiguration(final Class<?> type, final IsisConfiguration configuration) {
+    public static String encoderDecoderNameFromConfiguration(final Class<?> type, final IsisConfigurationLegacy configuration) {
         final String key = ENCODER_DECODER_NAME_KEY_PREFIX + type.getCanonicalName() + ENCODER_DECODER_NAME_KEY_SUFFIX;
         final String encoderDecoderName = configuration.getString(key);
         return !_Strings.isNullOrEmpty(encoderDecoderName) ? encoderDecoderName : null;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
index 52131b2..e506eb2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.parseable;
 
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 
@@ -35,7 +35,7 @@ public final class ParserUtil {
     public static final String PARSER_NAME_KEY_PREFIX = "isis.reflector.java.facets.parser.";
     public static final String PARSER_NAME_KEY_SUFFIX = ".parserName";
 
-    public static String parserNameFromConfiguration(final Class<?> type, final IsisConfiguration configuration) {
+    public static String parserNameFromConfiguration(final Class<?> type, final IsisConfigurationLegacy configuration) {
         final String key = PARSER_NAME_KEY_PREFIX + type.getCanonicalName() + PARSER_NAME_KEY_SUFFIX;
         final String parserName = configuration.getString(key);
         return !_Strings.isNullOrEmpty(parserName) ? parserName : null;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/promptStyle/PromptStyleConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/promptStyle/PromptStyleConfiguration.java
index 810ff15..ac3ce0d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/promptStyle/PromptStyleConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/promptStyle/PromptStyleConfiguration.java
@@ -19,7 +19,7 @@
 package org.apache.isis.metamodel.facets.object.promptStyle;
 
 import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 
 public class PromptStyleConfiguration {
@@ -28,7 +28,7 @@ public class PromptStyleConfiguration {
 
     public static final String PROMPT_STYLE_KEY = "isis.viewer.wicket.promptStyle";
 
-    public static PromptStyle parse(final IsisConfiguration configuration) {
+    public static PromptStyle parse(final IsisConfigurationLegacy configuration) {
         final String configuredValue = configuration.getString(PROMPT_STYLE_KEY);
         return PromptStyleConfiguration.parse(configuredValue);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index 427232f..94cb018 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -280,7 +280,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
     // ///////////////////////////////////////////////////////////////////////////
 
     protected NumberFormat determineNumberFormat(final String suffix) {
-        final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + suffix);
+        final String formatRequired = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + suffix);
         if (formatRequired != null) {
             return new DecimalFormat(formatRequired);
         } else {
@@ -289,7 +289,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
     }
 
     private Locale findLocale() {
-        final String localeStr = getConfiguration().getString(ConfigurationConstants.ROOT + "locale");
+        final String localeStr = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + "locale");
 
         final Locale findLocale = LocaleUtil.findLocale(localeStr);
         return findLocale != null ? findLocale : Locale.getDefault();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index fb54cf4..4715fcc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.value.vsp;
 
 import org.apache.isis.applib.adapters.ValueSemanticsProvider;
 import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.commons.ClassUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -38,7 +38,7 @@ public final class ValueSemanticsProviderUtil {
 
     public static String semanticsProviderNameFromConfiguration(final Class<?> type) {
 
-        final IsisConfiguration configuration = _Config.getConfiguration();
+        final IsisConfigurationLegacy configuration = _Config.getConfiguration();
 
         final String key = SEMANTICS_PROVIDER_NAME_KEY_PREFIX + type.getCanonicalName() + SEMANTICS_PROVIDER_NAME_KEY_SUFFIX;
         final String semanticsProviderName = configuration.getString(key);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 5f19505..59b2307 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -144,7 +144,7 @@ implements MetaModelValidatorRefiner {
                 PropertyDomainEvent.Noop.class,
                 PropertyDomainEvent.Default.class,
                 "isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault",
-                getConfiguration())) {
+                getConfigurationLegacy())) {
             FacetUtil.addFacet(propertyDomainEventFacet);
         }
 
@@ -244,7 +244,7 @@ implements MetaModelValidatorRefiner {
         }
 
         // check for @Property(command=...)
-        final CommandFacet commandFacet = CommandFacetForPropertyAnnotation.create(properties, getConfiguration(), holder, getServiceInjector());
+        final CommandFacet commandFacet = CommandFacetForPropertyAnnotation.create(properties, getConfigurationLegacy(), holder, getServiceInjector());
 
         FacetUtil.addFacet(commandFacet);
     }
@@ -281,7 +281,7 @@ implements MetaModelValidatorRefiner {
 
         // check for @Property(publishing=...)
         final PublishedPropertyFacet facet = PublishedPropertyFacetForPropertyAnnotation
-                .create(properties, getConfiguration(), holder);
+                .create(properties, getConfigurationLegacy(), holder);
 
         FacetUtil.addFacet(facet);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
index a72ba04..b1ea373 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.CommandReification;
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.services.command.CommandDtoProcessor;
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration;
 import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
@@ -36,7 +36,7 @@ public class CommandFacetForPropertyAnnotation extends CommandFacetAbstract {
 
     public static CommandFacet create(
             final List<Property> properties,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder,
             final ServiceInjector servicesInjector) {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
index edfc769..ae383d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.facets.properties.property.command;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.domainobject.Util;
 
 public enum CommandPropertiesConfiguration {
@@ -27,7 +27,7 @@ public enum CommandPropertiesConfiguration {
 
     private static final String  COMMAND_ACTIONS_KEY = "isis.services.command.properties";
 
-    public static CommandPropertiesConfiguration parse(final IsisConfiguration configuration) {
+    public static CommandPropertiesConfiguration parse(final IsisConfigurationLegacy configuration) {
         return parse(configuration.getString(COMMAND_ACTIONS_KEY));
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
index b4de9a4..da79411 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.facets.properties.property.publishing;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.domainobject.Util;
 
 public enum PublishPropertiesConfiguration {
@@ -27,7 +27,7 @@ public enum PublishPropertiesConfiguration {
 
     private static final String PUBLISH_PROPERTIES_KEY = "isis.services.publish.properties";
 
-    public static PublishPropertiesConfiguration parse(IsisConfiguration configuration) {
+    public static PublishPropertiesConfiguration parse(IsisConfigurationLegacy configuration) {
         final String configuredValue = configuration.getString(PUBLISH_PROPERTIES_KEY);
         return PublishPropertiesConfiguration.parse(configuredValue);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
index e27f265..17872ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet;
 import org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacetAbstract;
@@ -32,7 +32,7 @@ public class PublishedPropertyFacetForPropertyAnnotation extends PublishedProper
 
     public static PublishedPropertyFacet create(
             final List<Property> properties,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder) {
 
         final PublishPropertiesConfiguration setting = PublishPropertiesConfiguration.parse(configuration);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
index fdf3f3e..9f134d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.apache.isis.applib.annotation.PromptStyle;
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleConfiguration;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet;
@@ -42,7 +42,7 @@ public class PromptStyleFacetForPropertyLayoutAnnotation extends PromptStyleFace
 
     public static PromptStyleFacet create(
             final List<PropertyLayout> propertyLayouts,
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final FacetHolder holder) {
 
         return propertyLayouts.stream()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
index 262cfa7..0a60845 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
@@ -96,7 +96,7 @@ public class PropertyLayoutFacetFactory extends FacetFactoryAbstract implements
         }
 
         PromptStyleFacet promptStyleFacet = PromptStyleFacetForPropertyLayoutAnnotation
-                .create(propertyLayout, getConfiguration(), holder);
+                .create(propertyLayout, getConfigurationLegacy(), holder);
 
         FacetUtil.addFacet(promptStyleFacet);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
index aa40b5a..4f4fed3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
@@ -48,7 +48,7 @@ public abstract class DateAndTimeValueSemanticsProviderAbstract<T> extends Value
     public DateAndTimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final Immutability immutability, final EqualByContent equalByContent) {
         super("datetime", holder, adaptedClass, TYPICAL_LENGTH, immutability, equalByContent, (T) DEFAULT_VALUE);
 
-        final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.datetime");
+        final String formatRequired = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + "value.format.datetime");
         if (formatRequired == null) {
             format = formats().get(defaultFormat());
         } else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 48dd3d6..43ed8ea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -112,7 +112,7 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSem
         configureFormats();
 
         this.propertyType = propertyType;
-        configuredFormat = getConfiguration().getString(FORMAT_KEY_PREFIX + propertyType, defaultFormat()).toLowerCase().trim();
+        configuredFormat = getConfigurationLegacy().getString(FORMAT_KEY_PREFIX + propertyType, defaultFormat()).toLowerCase().trim();
         buildFormat(configuredFormat);
 
         encodingFormat = formats().get(ISO_ENCODING_FORMAT);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
index 5d0d8bc..6f6e380 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
@@ -44,7 +44,7 @@ public abstract class DateValueSemanticsProviderAbstract<T> extends ValueSemanti
     public DateValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final Immutability immutability, final EqualByContent equalByContent, final T defaultValue) {
         super("date", holder, adaptedClass, 12, immutability, equalByContent, defaultValue);
 
-        final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.date");
+        final String formatRequired = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + "value.format.date");
         if (formatRequired == null) {
             format = formats().get(defaultFormat());
         } else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
index 98c4e65..16959d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
@@ -146,7 +146,7 @@ public class Jdk8LocalDateValueSemanticsProvider extends ValueSemanticsProviderA
     public Jdk8LocalDateValueSemanticsProvider(final FacetHolder holder) {
         super(type(), holder, LocalDate.class, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
 
-        String configuredNameOrPattern = getConfiguration().getString(CFG_FORMAT_KEY, "medium").trim();
+        String configuredNameOrPattern = getConfigurationLegacy().getString(CFG_FORMAT_KEY, "medium").trim();
         updateTitleStringFormatter(configuredNameOrPattern);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
index 0c12a2b..c3d4133 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
@@ -147,7 +147,7 @@ public class JodaLocalDateValueSemanticsProvider extends ValueSemanticsProviderA
     public JodaLocalDateValueSemanticsProvider(final FacetHolder holder) {
         super(type(), holder, LocalDate.class, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
 
-        String configuredNameOrPattern = getConfiguration().getString(CFG_FORMAT_KEY, "medium").trim();
+        String configuredNameOrPattern = getConfigurationLegacy().getString(CFG_FORMAT_KEY, "medium").trim();
         updateTitleStringFormatter(configuredNameOrPattern);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
index 761a14f..be5c039 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
@@ -146,7 +146,7 @@ public class Jdk8LocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
     public Jdk8LocalDateTimeValueSemanticsProvider(final FacetHolder holder) {
         super(type(), holder, LocalDateTime.class, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
 
-        String configuredNameOrPattern = getConfiguration().getString(CFG_FORMAT_KEY, "medium").toLowerCase().trim();
+        String configuredNameOrPattern = getConfigurationLegacy().getString(CFG_FORMAT_KEY, "medium").toLowerCase().trim();
         updateTitleStringFormatter(configuredNameOrPattern);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
index dd405cd..05dc778 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
@@ -44,7 +44,7 @@ public abstract class Jdk8OffsetDateTimeValueSemanticsProviderAbstract<T> extend
     public Jdk8OffsetDateTimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final T defaultValue) {
         super("date", holder, adaptedClass, 12, Immutability.IMMUTABLE, EqualByContent.HONOURED, defaultValue);
 
-        final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.date");
+        final String formatRequired = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + "value.format.date");
         if (formatRequired == null) {
             format = formats().get(defaultFormat());
         } else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
index e75e5b9..29d286d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
@@ -44,7 +44,7 @@ public abstract class JodaDateTimeValueSemanticsProviderAbstract<T> extends Valu
     public JodaDateTimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final T defaultValue) {
         super("date", holder, adaptedClass, 12, Immutability.IMMUTABLE, EqualByContent.HONOURED, defaultValue);
 
-        final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.date");
+        final String formatRequired = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + "value.format.date");
         if (formatRequired == null) {
             format = formats().get(defaultFormat());
         } else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index 1be7290..d4cbae1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -148,7 +148,7 @@ public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
     public JodaLocalDateTimeValueSemanticsProvider(final FacetHolder holder) {
         super(type(), holder, LocalDateTime.class, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
 
-        String configuredNameOrPattern = getConfiguration().getString(CFG_FORMAT_KEY, "medium").toLowerCase().trim();
+        String configuredNameOrPattern = getConfigurationLegacy().getString(CFG_FORMAT_KEY, "medium").toLowerCase().trim();
         updateTitleStringFormatter(configuredNameOrPattern);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/money/MoneyValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
index 4ee2a5b..f2c6b22 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
@@ -82,7 +82,7 @@ public class MoneyValueSemanticsProvider extends ValueSemanticsProviderAndFacetA
         super(type(), holder, Money.class, TYPICAL_LENGTH, -1, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
 
         final String property = ConfigurationConstants.ROOT + "value.money.currency";
-        defaultCurrencyCode = getConfiguration().getString(property, LOCAL_CURRENCY_CODE);
+        defaultCurrencyCode = getConfigurationLegacy().getString(property, LOCAL_CURRENCY_CODE);
     }
 
     // //////////////////////////////////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
index c477ece..5b278a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
@@ -59,7 +59,7 @@ public class PercentageValueSemanticsProvider extends ValueSemanticsProviderAndF
     public PercentageValueSemanticsProvider(final FacetHolder holder) {
         super(type(), holder, Percentage.class, TYPICAL_LENGTH, -1, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
 
-        final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.percentage");
+        final String formatRequired = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + "value.format.percentage");
         if (formatRequired == null) {
             format = PERCENTAGE_FORMAT;
         } else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
index 323b909..b8f43c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
@@ -44,7 +44,7 @@ public abstract class TimeValueSemanticsProviderAbstract<T> extends ValueSemanti
     public TimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass) {
         super("time", holder, adaptedClass, TYPICAL_LENGTH, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, (T) DEFAULT_VALUE);
 
-        final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.time");
+        final String formatRequired = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + "value.format.time");
         if (formatRequired == null) {
             format = formats().get(defaultFormat());
         } else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
index 3c71a11..b4d399f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
@@ -43,7 +43,7 @@ abstract class TimeStampValueSemanticsProviderAbstract<T> extends ValueSemantics
     @SuppressWarnings("unchecked")
     public TimeStampValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass) {
         super("timestamp", holder, adaptedClass, TYPICAL_LENGTH, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, (T) DEFAULT_VALUE);
-        final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.timestamp");
+        final String formatRequired = getConfigurationLegacy().getString(ConfigurationConstants.ROOT + "value.format.timestamp");
         if (formatRequired == null) {
             format = formats().get(defaultFormat());
         } else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/FacetFactorySet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/FacetFactorySet.java
index 8a56e83..b104cfe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/FacetFactorySet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/FacetFactorySet.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.apache.isis.commons.internal.factory.InstanceUtil;
 import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.specloader.ReflectorConstants;
 
@@ -64,7 +64,7 @@ public interface FacetFactorySet {
     class Util {
         private Util(){}
 
-        public static void includeFacetFactories(final IsisConfiguration configuration, final FacetFactorySet programmingModel) {
+        public static void includeFacetFactories(final IsisConfigurationLegacy configuration, final FacetFactorySet programmingModel) {
             final String[] facetFactoriesIncludeClassNames = configuration.getList(ReflectorConstants.FACET_FACTORY_INCLUDE_CLASS_NAME_LIST);
             if (facetFactoriesIncludeClassNames != null) {
                 for (final String facetFactoryClassName : facetFactoriesIncludeClassNames) {
@@ -74,7 +74,7 @@ public interface FacetFactorySet {
             }
         }
 
-        public static void excludeFacetFactories(final IsisConfiguration configuration, final FacetFactorySet programmingModel) {
+        public static void excludeFacetFactories(final IsisConfigurationLegacy configuration, final FacetFactorySet programmingModel) {
             final String[] facetFactoriesExcludeClassNames = configuration.getList(ReflectorConstants.FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST);
             for (final String facetFactoryClassName : facetFactoriesExcludeClassNames) {
                 final Class<? extends FacetFactory> facetFactory = InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
index cc58fe0..e40f1ff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.factory.InstanceUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.MetaModelValidatorRefiner;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
@@ -42,7 +42,7 @@ public abstract class ProgrammingModelAbstract implements ProgrammingModel {
         IGNORE,
         HONOUR;
 
-        public static DeprecatedPolicy parse(final IsisConfiguration configuration) {
+        public static DeprecatedPolicy parse(final IsisConfigurationLegacy configuration) {
             boolean ignoreDep = configuration.getBoolean(KEY_IGNORE_DEPRECATED, false);
             return ignoreDep ? IGNORE : HONOUR;
         }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
index a3b7d5f..50883bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorDefault.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.collections._Collections;
 import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.commons.ToString;
 import org.apache.isis.metamodel.exceptions.MetaModelException;
 import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
@@ -52,7 +52,7 @@ public class ServiceInjectorDefault implements ServiceInjector {
     private static final String KEY_SET_PREFIX = "isis.services.injector.setPrefix";
     private static final String KEY_INJECT_PREFIX = "isis.services.injector.injectPrefix";
 
-    @Inject IsisConfiguration configuration;
+    @Inject IsisConfigurationLegacy configuration;
     @Inject ServiceRegistry serviceRegistry;
     @Inject InjectorMethodEvaluator injectorMethodEvaluator;
 
@@ -246,7 +246,7 @@ public class ServiceInjectorDefault implements ServiceInjector {
      * JUnit Test support. 
      */
     public static ServiceInjectorDefault getInstanceAndInit(
-            IsisConfiguration configuration,
+            IsisConfigurationLegacy configuration,
             ServiceRegistry serviceRegistry,
             InjectorMethodEvaluator injectorMethodEvaluator) {
         val instance = new ServiceInjectorDefault();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
index 754f8c7..6bf509b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/registry/ServiceRegistryDefault.java
@@ -43,7 +43,7 @@ import org.apache.isis.commons.internal.context._Context;
 import org.apache.isis.commons.internal.ioc.BeanAdapter;
 import org.apache.isis.commons.internal.ioc.spring._Spring;
 import org.apache.isis.commons.internal.reflection._Reflect;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.config.registry.IsisBeanTypeRegistry;
 
@@ -83,7 +83,7 @@ public final class ServiceRegistryDefault implements ServiceRegistry, Applicatio
     }
 
     @Bean @Singleton
-    public IsisConfiguration getConfiguration() {
+    public IsisConfigurationLegacy getConfiguration() {
         return isisConfiguration;
     }
 
@@ -100,7 +100,7 @@ public final class ServiceRegistryDefault implements ServiceRegistry, Applicatio
     // -- DEPS
 
     @Autowired private ConfigurableEnvironment configurableEnvironment;
-    private IsisConfiguration isisConfiguration;
+    private IsisConfigurationLegacy isisConfiguration;
 
     // -- HELPER
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/repository/RepositoryServiceJdo.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/repository/RepositoryServiceJdo.java
index 7d3404f..e7dc9bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/repository/RepositoryServiceJdo.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/repository/RepositoryServiceJdo.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.RepositoryException;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.query.QueryFindAllInstances;
 import org.apache.isis.applib.services.factory.FactoryService;
-import org.apache.isis.config.IsisConfigProperties;
+import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
 import org.apache.isis.applib.services.xactn.TransactionService;
@@ -48,7 +48,7 @@ public class RepositoryServiceJdo implements RepositoryService {
     private boolean autoFlush;
 
     @Inject
-    IsisConfigProperties isisConfigProperties;
+    IsisConfiguration isisConfigProperties;
 
     @PostConstruct
     public void init() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
index ea9e84a..633b77b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
@@ -63,7 +63,7 @@ public enum IntrospectionMode {
      */
     public static boolean isFullIntrospect() {
 
-        val config = MetaModelContext.current().getConfiguration();
+        val config = MetaModelContext.current().getConfigurationLegacy();
         val introspectionMode = SpecificationLoader.CONFIG_PROPERTY_MODE.from(config);
         val deploymentMode = _Context.getEnvironment().getDeploymentType();
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/MetaModelValidatorServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/MetaModelValidatorServiceDefault.java
index 8b4e77c..5727c43 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/MetaModelValidatorServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/MetaModelValidatorServiceDefault.java
@@ -24,7 +24,7 @@ import javax.inject.Singleton;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.factory.InstanceUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
 import org.apache.isis.metamodel.progmodel.ProgrammingModelService;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
@@ -47,7 +47,7 @@ public class MetaModelValidatorServiceDefault implements MetaModelValidatorServi
 
     // -- HELPER
 
-    @Inject private IsisConfiguration configuration;
+    @Inject private IsisConfigurationLegacy configuration;
     @Inject private ProgrammingModelService programmingModelService;
     @Inject private ServiceRegistry serviceRegistry; 
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
index 93ba399..73620ea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
@@ -22,7 +22,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract.DeprecatedPolicy;
 import org.apache.isis.metamodel.progmodel.ProgrammingModelService;
@@ -41,7 +41,7 @@ public class ProgrammingModelServiceDefault implements ProgrammingModelService {
 
     // -- HELPER
 
-    @Inject private IsisConfiguration configuration;
+    @Inject private IsisConfigurationLegacy configuration;
 
     private _Lazy<ProgrammingModel> programmingModel = 
             _Lazy.threadSafe(this::createProgrammingModel);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
index 7635f16..9db1c31 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.specloader;
 
 import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
 import org.apache.isis.metamodel.progmodel.ProgrammingModel;
@@ -31,7 +31,7 @@ public final class ReflectorConstants {
 
     /**
      * Key used to lookup implementation of {@link ProgrammingModel} in
-     * {@link IsisConfiguration}.
+     * {@link IsisConfigurationLegacy}.
      *
      * @see #FACET_FACTORY_INCLUDE_CLASS_NAME_LIST
      * @see #FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST
@@ -41,7 +41,7 @@ public final class ReflectorConstants {
 
     /**
      * Key used to lookup implementation of {@link MetaModelValidator} in
-     * {@link IsisConfiguration}.
+     * {@link IsisConfigurationLegacy}.
      */
     public static final String META_MODEL_VALIDATOR_CLASS_NAME = ConfigurationConstants.ROOT + "reflector.validator";
     public static final String META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT = MetaModelValidatorDefault.class.getName();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ServiceInitializer.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ServiceInitializer.java
index 1c5b9f8..02a78ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ServiceInitializer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ServiceInitializer.java
@@ -26,7 +26,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
 import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.commons.MethodExtensions;
 
 import lombok.extern.log4j.Log4j2;
@@ -42,7 +42,7 @@ class ServiceInitializer {
     private Map<Object, Method> preDestroyMethodsByService = _Maps.newLinkedHashMap();
 
     public ServiceInitializer(
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final List<Object> services) {
         this.props = configuration.copyToMap();
         this.services = services;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index 30c3819..9ab2e70 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -29,7 +29,7 @@ import javax.inject.Singleton;
 
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.config.registry.IsisBeanTypeRegistry;
 import org.apache.isis.metamodel.facetapi.Facet;
@@ -340,7 +340,7 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
 
     // -- HELPER
 
-    private IsisConfiguration getConfiguration() {
+    private IsisConfigurationLegacy getConfiguration() {
         return _Config.getConfiguration();
     }	
 
@@ -367,9 +367,12 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
 
             val isManagedBean = IsisBeanTypeRegistry.current().isManagedBean(cls);
 
-            objectSpec = new ObjectSpecificationDefault(cls,
+            objectSpec = new ObjectSpecificationDefault(
+                    cls,
                     facetedMethodsBuilderContext,
-                    facetProcessor, isManagedBean, postProcessor);
+                    facetProcessor, 
+                    isManagedBean, 
+                    postProcessor);
         }
 
         return objectSpec;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 1081bf0..2b63a3a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -20,15 +20,17 @@
 package org.apache.isis.metamodel.specloader.specimpl;
 
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.commons.exceptions.IsisException;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.ioc.spring._Spring;
-import org.apache.isis.config.IsisConfigProperties;
+import org.apache.isis.metamodel.MetaModelContext;
 import org.apache.isis.metamodel.commons.ListExtensions;
 import org.apache.isis.metamodel.commons.MethodUtil;
 import org.apache.isis.metamodel.commons.ToString;
@@ -156,7 +158,8 @@ public class FacetedMethodsBuilder {
         this.facetProcessor = facetedMethodsBuilderContext.facetProcessor;
         this.specificationLoader = facetedMethodsBuilderContext.specificationLoader;
 
-        final IsisConfigProperties isisConfigProperties = _Spring.getSingletonElseFail(IsisConfigProperties.class);
+        val isisConfigProperties = MetaModelContext.current().getConfiguration();
+        
         this.explicitAnnotationsForActions = isisConfigProperties.getReflector().getExplicitAnnotations().isAction();
 
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
index ad5abf3..ebc9c1d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.metamodel.specloader.validator;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.metamodel.facets.FacetFactory;
@@ -32,7 +32,7 @@ public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelV
 
     private final ValidationFailures failures = new ValidationFailures();
 
-    private IsisConfiguration configuration;
+    private IsisConfigurationLegacy configuration;
 
     /**
      * @param facet
@@ -76,7 +76,7 @@ public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelV
         validationFailures.addAll(failures);
     }
 
-    public void setConfiguration(IsisConfiguration configuration) {
+    public void setConfiguration(IsisConfigurationLegacy configuration) {
         this.configuration = configuration;
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
index 8269380..766ccd8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
@@ -36,7 +36,7 @@ public class MetaModelValidatorToCheckModuleExtent extends MetaModelValidatorCom
 
     @Override
     public void validate(final ValidationFailures validationFailures) {
-        boolean check = getConfiguration()
+        boolean check = getConfigurationLegacy()
                 .getBoolean(ISIS_REFLECTOR_CHECK_MODULE_EXTENT_KEY,
                         ISIS_REFLECTOR_CHECK_MODULE_EXTENT_DEFAULT);
         if(!check) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
index 8d896fb..3d55edc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
@@ -43,7 +43,7 @@ public class MetaModelValidatorToCheckObjectSpecIdsUnique extends MetaModelValid
 
     @Override
     public void validate(final ValidationFailures validationFailures) {
-        boolean check = getConfiguration()
+        boolean check = getConfigurationLegacy()
                 .getBoolean(ISIS_REFLECTOR_ENSURE_UNIQUE_OBJECT_IDS_KEY,
                         ISIS_REFLECTOR_ENSURE_UNIQUE_OBJECT_IDS_DEFAULT);
         if(!check) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/EventUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/EventUtil.java
index 54a023e..db196f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/EventUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/EventUtil.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.util;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 public final class EventUtil {
 
@@ -31,7 +31,7 @@ public final class EventUtil {
             final Class<? extends T> noopClass,
             final Class<? extends T> defaultClass,
             final String configProp,
-            final IsisConfiguration configuration) {
+            final IsisConfigurationLegacy configuration) {
         if (noopClass.isAssignableFrom(eventType)) {
             return false;
         }
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
index eaf13fb..da1d311 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -67,8 +67,8 @@ class MetaModelContext_configTest {
 
     // -- HELPER
 
-    private IsisConfiguration config() {
-        return MetaModelContext.current().getConfiguration();
+    private IsisConfigurationLegacy config() {
+        return MetaModelContext.current().getConfigurationLegacy();
     }
 
 }
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
index 0fd7d86..8c0c0b5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
@@ -25,7 +25,7 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleConfiguration;
 import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
 
@@ -37,7 +37,7 @@ public class PromptStyleConfiguration_Test {
     public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
 
     @Mock
-    IsisConfiguration mockIsisConfiguration;
+    IsisConfigurationLegacy mockIsisConfiguration;
 
     @Test
     public void when_none() throws Exception {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index e779aa9..c8eb830 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 
 import org.apache.isis.applib.annotation.PromptStyle;
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured;
@@ -47,7 +47,7 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
     public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
 
     @Mock
-    IsisConfiguration mockConfiguration;
+    IsisConfigurationLegacy mockConfiguration;
 
     @Mock
     FacetHolder mockFacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index 2ee6d65..a477e9f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -27,7 +27,7 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facets.value.image.ImageValueSemanticsProviderAbstract;
@@ -48,7 +48,7 @@ public class ImageValueSemanticsProviderAbstractTest {
     private ServiceInjector mockServicesInjector;
 
     @Mock
-    private IsisConfiguration mockConfiguration;
+    private IsisConfigurationLegacy mockConfiguration;
 
     private TestImageSemanticsProvider adapter;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/ServiceInitializerTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/ServiceInitializerTest.java
index 21bfae8..c0b6134 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/ServiceInitializerTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/ServiceInitializerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
 
@@ -51,7 +51,7 @@ public class ServiceInitializerTest {
     private Map<String,String> props;
 
     @Mock
-    private IsisConfiguration configuration;
+    private IsisConfigurationLegacy configuration;
     private ServiceInitializer serviceInitializer;
 
     @Rule
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
index fe7b5de..02c0a9f 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
 import javax.jdo.annotations.Queries;
 import javax.jdo.annotations.Query;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.JdoMetamodelUtil;
 import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -78,7 +78,7 @@ public class JdoQueryAnnotationFacetFactory extends FacetFactoryAbstract impleme
     public void refineMetaModelValidator(
             final MetaModelValidatorComposite metaModelValidator) {
 
-        final IsisConfiguration configuration = _Config.getConfiguration();
+        final IsisConfigurationLegacy configuration = _Config.getConfiguration();
         final boolean validateFromClause = configuration.getBoolean(
                 ISIS_REFLECTOR_VALIDATOR_JDOQL_FROM_CLAUSE_KEY,
                 ISIS_REFLECTOR_VALIDATOR_JDOQL_FROM_CLAUSE_DEFAULT);
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
index 6e6d068..9db6b64 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.metrics.MetricsService;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.jdo.datanucleus.persistence.queries.PersistenceQueryProcessor;
 import org.apache.isis.metamodel.commons.ToString;
@@ -56,7 +56,7 @@ abstract class PersistenceSessionBase implements PersistenceSession {
     protected final FixturesInstalledStateHolder fixturesInstalledStateHolder;
 
     protected final PersistenceQueryFactory persistenceQueryFactory;
-    protected final IsisConfiguration configuration;
+    protected final IsisConfigurationLegacy configuration;
     protected final SpecificationLoader specificationLoader;
     protected final AuthenticationSession authenticationSession;
 
@@ -158,7 +158,7 @@ abstract class PersistenceSessionBase implements PersistenceSession {
 
 
     @Override
-    public IsisConfiguration getConfiguration() {
+    public IsisConfigurationLegacy getConfiguration() {
         return configuration;
     }
 
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
index 0b71f89..289c875 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
@@ -38,7 +38,7 @@ import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
 import org.apache.isis.commons.internal.factory.InstanceUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.jdo.datanucleus.CreateSchemaObjectFromClassMetadata;
 import org.apache.isis.jdo.datanucleus.DataNucleusLifeCycleHelper;
 import org.apache.isis.jdo.datanucleus.DataNucleusPropertiesAware;
@@ -86,13 +86,13 @@ public class DataNucleusApplicationComponents5 implements ApplicationScopedCompo
     ///////////////////////////////////////////////////////////////////////////
 
     private final Set<String> persistableClassNameSet;
-    private final IsisConfiguration jdoObjectstoreConfig;
+    private final IsisConfigurationLegacy jdoObjectstoreConfig;
     private final Map<String, String> datanucleusProps;
 
     private PersistenceManagerFactory persistenceManagerFactory;
 
     public DataNucleusApplicationComponents5(
-            final IsisConfiguration configuration,
+            final IsisConfigurationLegacy configuration,
             final Map<String, String> datanucleusProps,
             final Set<String> persistableClassNameSet) {
 
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
index 2ca7b31..c42458e 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
@@ -32,7 +32,7 @@ import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
 import org.apache.isis.commons.internal.base._Blackhole;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.jdo.datanucleus.JDOStateManagerForIsis;
 import org.apache.isis.jdo.entities.JdoEntityTypeRegistry;
@@ -65,7 +65,7 @@ implements PersistenceSessionFactory, ApplicationScopedComponent, FixturesInstal
             _Lazy.threadSafe(this::createDataNucleusApplicationComponents);
     
     private StoreLifecycleListener storeLifecycleListener;
-    private IsisConfiguration configuration;
+    private IsisConfigurationLegacy configuration;
 
     @Getter(onMethod=@__({@Override})) 
     @Setter(onMethod=@__({@Override})) 
diff --git a/core/pom.xml b/core/pom.xml
index 8950695..e70dc70 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2102,17 +2102,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- OPTIONAL -->
-
-		<!-- IDE support -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<version>${spring-boot.version}</version>
-			<optional>true</optional>
-		</dependency>
-
-
 	</dependencies>
 
 	<profiles>
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
index 480971b..77896f9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.services.confview.ConfigurationViewService;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.context._Context;
 import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 
 /**
@@ -57,7 +57,7 @@ public class ConfigurationViewServiceDefault implements ConfigurationViewService
         _Config.getConfiguration().copyToMap().forEach((k, v)->add(k, v, map));
 
         // for convenience add some additional info to the top ...
-        add("[ Isis Version ]", IsisConfiguration.getVersion(), map);
+        add("[ Isis Version ]", IsisConfigurationLegacy.getVersion(), map);
         add("[ Deployment Type ]", _Context.getEnvironment().getDeploymentType().name(), map);
         add("[ Unit Testing ]", ""+_Context.getEnvironment().isUnitTesting(), map);
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
index 4f94acf..5cf403a 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.services.email.EmailService;
 import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 import lombok.extern.log4j.Log4j2;
 
@@ -260,6 +260,6 @@ public class EmailServiceDefault implements EmailService {
         return addresses != null && addresses.length > 0;
     }
 
-    @Inject IsisConfiguration configuration;
+    @Inject IsisConfigurationLegacy configuration;
 
 }
\ No newline at end of file
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
index 6289312..e04ec22 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
@@ -30,7 +30,7 @@ import javax.servlet.ServletException;
 
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 
 import static org.apache.isis.commons.internal.base._With.acceptIfPresent;
@@ -57,7 +57,7 @@ public class WebModuleContext {
     private final StringBuilder viewers = new StringBuilder();
     private final StringBuilder protectedPath = new StringBuilder();
 
-    private final IsisConfiguration isisConfiguration;
+    private final IsisConfigurationLegacy isisConfiguration;
     private List<WebModule> webModules;
     private final List<ServletContextListener> activeListeners = new ArrayList<>();
 
@@ -65,7 +65,7 @@ public class WebModuleContext {
         this.isisConfiguration = _Config.getConfiguration();
     }
 
-    public IsisConfiguration getConfiguration() {
+    public IsisConfigurationLegacy getConfiguration() {
         return isisConfiguration;
     }
 
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java
index 891fc20..79b021a 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java
@@ -29,7 +29,7 @@ import org.springframework.core.annotation.Order;
 import org.apache.isis.applib.value.LocalResourcePath;
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.webapp.modules.WebModule;
 import org.apache.isis.webapp.modules.WebModuleContext;
 
@@ -39,7 +39,7 @@ import lombok.val;
 @Singleton @Order(0)
 public class WebModuleH2Console implements WebModule  {
 
-    @Inject private IsisConfiguration isisConfiguration;
+    @Inject private IsisConfigurationLegacy isisConfiguration;
 
     private final static String SERVLET_NAME = "H2Console";
     private final static String SERVLET_CLASS_NAME = "org.h2.server.web.WebServlet";
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java
index 0d4dfd7..0c0fca3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java
@@ -20,7 +20,7 @@
 package org.apache.isis.runtime.system;
 
 import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 public final class SystemConstants {
 
@@ -41,7 +41,7 @@ public final class SystemConstants {
 
     /**
      * Key by which requested fixture (eg via command line) is made available in
-     * {@link IsisConfiguration}.
+     * {@link IsisConfigurationLegacy}.
      */
     public final static String FIXTURE_KEY = ConfigurationConstants.ROOT + "fixtures";
 
@@ -57,7 +57,7 @@ public final class SystemConstants {
 
     /**
      * Key by which requested user (eg via command line) is made available in
-     * {@link IsisConfiguration} .
+     * {@link IsisConfigurationLegacy} .
      *
      * @deprecated
      */
@@ -66,7 +66,7 @@ public final class SystemConstants {
 
     /**
      * Key by which requested password (eg via command line) is made available
-     * in {@link IsisConfiguration}.
+     * in {@link IsisConfigurationLegacy}.
      *
      * @deprecated
      */
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
index b6c221b..0ff9135 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.commons.internal.context._Context;
 import org.apache.isis.commons.internal.ioc.spring._Spring;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.MetaModelContext;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
@@ -112,8 +112,8 @@ public interface IsisContext {
      * @return framework's IsisConfiguration
      * @throws NoSuchElementException - if IsisConfiguration not managed
      */
-    public static IsisConfiguration getConfiguration() {
-        return MetaModelContext.current().getConfiguration();
+    public static IsisConfigurationLegacy getConfiguration() {
+        return MetaModelContext.current().getConfigurationLegacy();
         //return _Config.getConfiguration(); 
     }
 
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
index ab00018..020b981 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
@@ -20,7 +20,7 @@ package org.apache.isis.runtime.system.context.session;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.oid.Oid;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
@@ -41,7 +41,7 @@ import org.apache.isis.security.authentication.AuthenticationSession;
 public interface RuntimeContext {
 
     AuthenticationSession getAuthenticationSession();
-    IsisConfiguration getConfiguration();
+    IsisConfigurationLegacy getConfiguration();
     SpecificationLoader getSpecificationLoader();
     ServiceInjector getServiceInjector();
     ServiceRegistry getServiceRegistry();
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
index 112d161..aaabad5 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.MetaModelContext;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
@@ -54,7 +54,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
 
     // -- FINAL FIELDS
 
-    @Getter protected final IsisConfiguration configuration;
+    @Getter protected final IsisConfigurationLegacy configuration;
     @Getter protected final ServiceInjector serviceInjector;
     @Getter protected final ServiceRegistry serviceRegistry;
     @Getter protected final SpecificationLoader specificationLoader;
@@ -67,7 +67,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
 
     protected RuntimeContextBase() {
         val mmc = MetaModelContext.current();
-        configuration = mmc.getConfiguration();
+        configuration = mmc.getConfigurationLegacy();
         serviceInjector = mmc.getServiceInjector();
         serviceRegistry = mmc.getServiceRegistry();
         specificationLoader = mmc.getSpecificationLoader();
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java
index 3b393df..9a2d584 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java
@@ -21,7 +21,7 @@ package org.apache.isis.runtime.system.internal;
 
 import java.util.Locale;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.runtime.system.SystemConstants;
 
 import lombok.extern.log4j.Log4j2;
@@ -29,7 +29,7 @@ import lombok.extern.log4j.Log4j2;
 @Log4j2
 public class IsisLocaleInitializer {
 
-    public void initLocale(final IsisConfiguration configuration) {
+    public void initLocale(final IsisConfigurationLegacy configuration) {
         final String localeSpec = configuration.getString(SystemConstants.LOCALE_KEY);
         if (localeSpec != null) {
             final int pos = localeSpec.indexOf('_');
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java
index fae8612..5b9026e 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java
@@ -22,14 +22,14 @@ package org.apache.isis.runtime.system.internal;
 import java.util.TimeZone;
 
 import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
 public class IsisTimeZoneInitializer {
 
-    public void initTimeZone(final IsisConfiguration configuration) {
+    public void initTimeZone(final IsisConfigurationLegacy configuration) {
         final String timeZoneSpec = configuration.getString(ConfigurationConstants.ROOT + "timezone");
         if (timeZoneSpec != null) {
             TimeZone timeZone;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSession.java
index 68f5a4f..9c20681 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSession.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.commons.collections.Bin;
 import org.apache.isis.commons.internal.components.SessionScopedComponent;
 import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.ObjectAdapterByIdProvider;
 import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
@@ -54,7 +54,7 @@ SessionScopedComponent {
     // -- STABLE API (DRAFT)
     // -------------------------------------------------------------------------------------------------
 
-    IsisConfiguration getConfiguration();
+    IsisConfigurationLegacy getConfiguration();
     ServiceInjector getServiceInjector();
     TransactionService getTransactionService();
 
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
index fe9a553..eeac91d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
@@ -46,7 +46,7 @@ import org.apache.isis.commons.internal.concurrent._ConcurrentTaskList;
 import org.apache.isis.commons.internal.context._Context;
 import org.apache.isis.commons.internal.ioc.BeanAdapter;
 import org.apache.isis.commons.internal.ioc.BeanSort;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
@@ -94,7 +94,7 @@ public class IsisSessionFactoryDefault implements IsisSessionFactory {
         log.info("Initialising Isis System");
         log.info("working directory: {}", new File(".").getAbsolutePath());
 
-        final IsisConfiguration configuration = _Config.getConfiguration();
+        final IsisConfigurationLegacy configuration = _Config.getConfiguration();
         //log.info("resource stream source: {}", configuration.getResourceStreamSource());
 
         localeInitializer.initLocale(configuration);
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 9e2c4ea..9d92eba 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -31,7 +31,7 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.security.authentication.AuthenticationRequest;
 import org.apache.isis.security.authentication.AuthenticationRequestPassword;
@@ -49,7 +49,7 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
     public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
 
     @Mock
-    private IsisConfiguration mockConfiguration;
+    private IsisConfigurationLegacy mockConfiguration;
 
     private ShiroAuthenticator authenticator;
     private ShiroAuthorizor authorizor;
diff --git a/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index 37210f7..cb848fb 100644
--- a/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.oid.Oid;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
@@ -87,7 +87,7 @@ class DomainResourceHelper {
         }
 
         @Override
-        public IsisConfiguration getConfiguration() {
+        public IsisConfigurationLegacy getConfiguration() {
             return rendererContext.getConfiguration();
         }
 
diff --git a/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index 839c7f5..ba1ded0 100644
--- a/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.commons.internal.context._Context;
 import org.apache.isis.commons.internal.url.UrlDecoderUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.MetaModelContext;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.system.persistence.PersistenceSession;
@@ -61,7 +61,7 @@ public class ResourceContextTest_getArg {
     @Mock ServletContext mockServletContext;
     @Mock IsisSessionFactory mockIsisSessionFactory;
     @Mock ServiceInjector mockServicesInjector;
-    @Mock IsisConfiguration mockConfiguration;
+    @Mock IsisConfigurationLegacy mockConfiguration;
     @Mock IsisSession mockIsisSession;
     @Mock AuthenticationSession mockAuthenticationSession;
     @Mock PersistenceSession mockPersistenceSession;
diff --git a/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 717c004..6b3ed47 100644
--- a/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.MetaModelContext;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.system.persistence.PersistenceSession;
@@ -60,7 +60,7 @@ public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest
     @Mock ServletContext mockServletContext;
     @Mock IsisSessionFactory mockIsisSessionFactory;
     @Mock ServiceInjector mockServicesInjector;
-    @Mock IsisConfiguration mockConfiguration;
+    @Mock IsisConfigurationLegacy mockConfiguration;
     @Mock IsisSession mockIsisSession;
     @Mock AuthenticationSession mockAuthenticationSession;
     @Mock PersistenceSession mockPersistenceSession;
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 755e86e..be5ce32 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
@@ -65,7 +65,7 @@ import org.apache.isis.commons.internal.concurrent._ConcurrentContext;
 import org.apache.isis.commons.internal.concurrent._ConcurrentTaskList;
 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.IsisConfigurationLegacy;
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.specloader.validator.MetaModelDeficiencies;
@@ -345,14 +345,14 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
     /**
      * protected visibility to allow ad-hoc overriding of some other authentication strategy.
      */
-    protected void configureSecurity(final IsisConfiguration configuration) {
+    protected void configureSecurity(final IsisConfigurationLegacy configuration) {
         getSecuritySettings().setAuthenticationStrategy(newAuthenticationStrategy(configuration));
     }
 
     /**
      * protected visibility to allow ad-hoc overriding of some other authentication strategy.
      */
-    protected IAuthenticationStrategy newAuthenticationStrategy(final IsisConfiguration configuration) {
+    protected IAuthenticationStrategy newAuthenticationStrategy(final IsisConfigurationLegacy configuration) {
         final String cookieKey = configuration.getString(WICKET_REMEMBER_ME_COOKIE_KEY,
                 WICKET_REMEMBER_ME_COOKIE_KEY_DEFAULT);
         final String encryptionKey = configuration.getString(WICKET_REMEMBER_ME_ENCRYPTION_KEY, defaultEncryptionKeyIfNotConfigured());
@@ -360,7 +360,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
     }
 
     /**
-     * As called by {@link #newAuthenticationStrategy(IsisConfiguration)}; if an encryption key for the 'rememberMe'
+     * As called by {@link #newAuthenticationStrategy(IsisConfigurationLegacy)}; if an encryption key for the 'rememberMe'
      * cookie hasn't been configured, then use a different encryption key for the 'rememberMe' cookie each time the
      * app is restarted.
      */
@@ -391,7 +391,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
     }
 
     protected void configureWicketSourcePluginIfNecessary() {
-        final IsisConfiguration configuration = _Config.getConfiguration();
+        final IsisConfigurationLegacy configuration = _Config.getConfiguration();
         requireNonNull(configuration, "Configuration must be prepared prior to init().");
 
         if(isWicketSourcePluginEnabled(configuration)) {
@@ -589,7 +589,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
              * If the <tt>isis.viewer.wicket.stripWicketTags</tt> is set, then this is used, otherwise the default is to strip
              * the tags because they may break some CSS rules.
              */
-            private boolean determineStripWicketTags(IsisConfiguration configuration) {
+            private boolean determineStripWicketTags(IsisConfigurationLegacy configuration) {
                 final boolean strip = configuration.getBoolean(STRIP_WICKET_TAGS_KEY, STRIP_WICKET_TAGS_DEFAULT);
                 return strip;
             }
@@ -602,7 +602,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
              * <p>
              * If the <tt>isis.viewer.wicket.ajaxDebugMode</tt> is set, then this is used, otherwise the default is to disable.
              */
-            private boolean determineAjaxDebugModeEnabled(IsisConfiguration configuration) {
+            private boolean determineAjaxDebugModeEnabled(IsisConfigurationLegacy configuration) {
                 final boolean debugModeEnabled = configuration.getBoolean(AJAX_DEBUG_MODE_KEY, AJAX_DEBUG_MODE_DEFAULT);
                 return debugModeEnabled;
             }
@@ -613,7 +613,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
              * <p>
              * If the <tt>isis.viewer.wicket.wicketSourcePlugin</tt> is set, then this is used, otherwise the default is to disable.
              */
-            private boolean isWicketSourcePluginEnabled(IsisConfiguration configuration) {
+            private boolean isWicketSourcePluginEnabled(IsisConfigurationLegacy configuration) {
                 final boolean pluginEnabled = configuration.getBoolean(WICKET_SOURCE_PLUGIN_KEY, WICKET_SOURCE_PLUGIN_DEFAULT);
                 return pluginEnabled;
             }
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 3836302..cfa7203 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
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.viewer.settings;
 import javax.inject.Singleton;
 
 import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleConfiguration;
 import org.apache.isis.runtime.system.context.IsisContext;
 import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
@@ -32,7 +32,7 @@ public class WicketViewerSettingsDefault implements WicketViewerSettings {
 
     private static final long serialVersionUID = 1L;
 
-    IsisConfiguration getConfiguration() {
+    IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
diff --git a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 2073732..fb5e275 100644
--- a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -27,7 +27,7 @@ import java.util.Objects;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.adapter.oid.RootOid;
 import org.apache.isis.runtime.system.context.IsisContext;
 
@@ -143,7 +143,7 @@ public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>>
     // //////////////////////////////////////
 
 
-    protected IsisConfiguration getConfiguration() {
+    protected IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
diff --git a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index b94bacc..4c862d1 100644
--- a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++ b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.model.models.whereami;
 import java.util.LinkedList;
 import java.util.stream.Stream;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.util.pchain.ParentChain;
 import org.apache.isis.runtime.system.context.IsisContext;
@@ -87,7 +87,7 @@ class WhereAmIModelDefault implements WhereAmIModel {
         return new EntityModel(objectAdapter);
     }
 
-    private void overrideFromConfigIfNew(IsisConfiguration configuration) {
+    private void overrideFromConfigIfNew(IsisConfigurationLegacy configuration) {
 
         //[ahuber] without evidence that this significantly improves performance,
         // (skipping 2 hash-table lookups) we use the smart update idiom here ...
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 63ffeaa..386522d 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
@@ -33,7 +33,7 @@ import org.apache.wicket.model.Model;
 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.IsisConfigurationLegacy;
 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;
@@ -117,7 +117,7 @@ public class FooterPanel extends PanelAbstract<Model<String>> {
             return "credit" + num + component;
         }
 
-        public static Credit create(final IsisConfiguration configuration, final int num) {
+        public static Credit create(final IsisConfigurationLegacy configuration, final int num) {
             String base = "isis.viewer.wicket.credit." + num + ".";
             String url = configuration.getString(base + "url");
             String name = configuration.getString(base + "name");
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index ceeaf53..fab2919 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -31,7 +31,7 @@ import org.apache.wicket.request.resource.CssResourceReference;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.util.convert.IConverter;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.runtime.system.context.IsisContext;
 import org.apache.isis.runtime.system.session.IsisSessionFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.DateConverter;
@@ -162,7 +162,7 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
         return $(this).chain("datetimepicker", config).get();
     }
 
-    IsisConfiguration getConfiguration() {
+    IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
index 311916c..6aa6d94 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
@@ -30,7 +30,7 @@ import com.google.common.collect.Iterables;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.runtime.system.context.IsisContext;
 
 import de.agilecoders.wicket.core.settings.ITheme;
@@ -154,7 +154,7 @@ public class IsisWicketThemeSupportDefault implements IsisWicketThemeSupport {
         return enabledThemes;
     }
 
-    private IsisConfiguration getConfiguration() {
+    private IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index 2d354cd..bce3063 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -29,7 +29,7 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.util.cookies.CookieUtils;
 import org.apache.wicket.util.string.Strings;
 
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.runtime.system.context.IsisContext;
 import org.apache.isis.runtime.system.session.IsisSessionFactory;
 
@@ -156,7 +156,7 @@ public class ThemeChooser extends Panel {
         return IsisWicketThemeSupport.getInstance();
     }
 
-    private IsisConfiguration getConfiguration() {
+    private IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
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 738d354..6d8e629 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
@@ -66,7 +66,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.commons.internal.ioc.BeanSort;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.config.property.ConfigPropertyEnum;
 import org.apache.isis.runtime.system.context.IsisContext;
@@ -539,7 +539,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
 
     // -- DEPS
 
-    protected IsisConfiguration getConfiguration() {
+    protected IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
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 ce56e0c..068518e 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
@@ -36,7 +36,7 @@ import org.apache.wicket.markup.html.basic.Label;
 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.IsisConfigurationLegacy;
 import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.runtime.system.context.IsisContext;
 import org.apache.isis.runtime.system.session.IsisSessionFactory;
@@ -138,7 +138,7 @@ public class AccountManagementPageAbstract extends WebPage {
     // System components
     // ///////////////////////////////////////////////////
 
-    protected IsisConfiguration getConfiguration() {
+    protected IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
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 5310b73..d9a142a 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
@@ -39,7 +39,7 @@ 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.IsisConfigurationLegacy;
 import org.apache.isis.config.beans.WebAppConfigBean;
 import org.apache.isis.runtime.system.context.IsisContext;
 import org.apache.isis.runtime.system.session.IsisSessionFactory;
@@ -120,7 +120,7 @@ public class MmvErrorPage extends WebPage {
     // System components
     // ///////////////////////////////////////////////////
 
-    protected IsisConfiguration getConfiguration() {
+    protected IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
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 d82521f..f747de7 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
@@ -29,7 +29,7 @@ import org.apache.wicket.model.IModel;
 
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.system.context.IsisContext;
@@ -167,7 +167,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel {
         return IsisContext.pojoToAdapter();
     }
 
-    protected IsisConfiguration getConfiguration() {
+    protected IsisConfigurationLegacy getConfiguration() {
         return IsisContext.getConfiguration();
     }
 
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java b/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
index 41c9ba9..c833b19 100644
--- a/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
+++ b/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
@@ -43,7 +43,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationLegacy;
 import org.apache.isis.runtime.system.context.IsisContext;
 
 import static org.apache.isis.commons.internal.collections._Lists.lastElementIfAny;
@@ -415,7 +415,7 @@ public class DomainObjectContainer {
 
 
     /**
-     * @deprecated - use {@link IsisConfiguration#getProperty(String)} instead.
+     * @deprecated - use {@link IsisConfigurationLegacy#getProperty(String)} instead.
      */
     @Deprecated
     @Programmatic
@@ -424,7 +424,7 @@ public class DomainObjectContainer {
     }
 
     /**
-     * @deprecated - use {@link IsisConfiguration#getProperty(String, String)} instead.
+     * @deprecated - use {@link IsisConfigurationLegacy#getProperty(String, String)} instead.
      */
     @Deprecated
     @Programmatic
@@ -433,7 +433,7 @@ public class DomainObjectContainer {
     }
 
     /**
-     * @deprecated - use {@link IsisConfiguration#asMap()} instead.
+     * @deprecated - use {@link IsisConfigurationLegacy#asMap()} instead.
      */
     @Deprecated
     @Programmatic