You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 15:22:31 UTC
[isis] 17/21: ISIS-2259: fixes package names for isis-core-config
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b6d4fa12aa681fb40068459822cf9215dd7b10cd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 14:11:03 2020 +0000
ISIS-2259: fixes package names for isis-core-config
---
.../bytebuddy/IsisModuleCoreCodegenByteBuddy.java | 6 +++---
.../isis/core/commons/IsisModuleCoreCommons.java | 2 +-
.../{ => core}/config/ConfigurationConstants.java | 2 +-
.../isis/{ => core}/config/IsisConfiguration.java | 24 +++++++++++-----------
.../isis/{ => core}/config/IsisModuleConfig.java | 14 ++++++-------
.../{ => core}/config/RestEasyConfiguration.java | 2 +-
.../IsisBeanFactoryPostProcessorForSpring.java | 2 +-
.../config/beans/IsisBeanTypeRegistry.java | 2 +-
.../config/beans/IsisBeanTypeRegistryHolder.java | 2 +-
.../config/beans/IsisComponentScanInterceptor.java | 2 +-
.../isis/{ => core}/config/beans/TypeMetaData.java | 2 +-
.../config/messages/MessageRegistry.java | 2 +-
.../facets/AuditObjectsConfiguration.java | 4 ++--
.../facets/CommandActionsConfiguration.java | 4 ++--
.../facets/CommandPropertiesConfiguration.java | 2 +-
.../metamodel/facets/DefaultViewConfiguration.java | 4 ++--
.../facets/EditingObjectsConfiguration.java | 2 +-
.../facets/PublishActionsConfiguration.java | 4 ++--
.../facets/PublishObjectsConfiguration.java | 4 ++--
.../facets/PublishPropertiesConfiguration.java | 2 +-
.../{ => core}/config/metamodel/facets/Util.java | 2 +-
.../ApplicationFeaturesInitConfiguration.java | 2 +-
.../metamodel/specloader/IntrospectionMode.java | 4 ++--
.../presets/DataNucleusAutoCreate.properties | 0
.../config/presets/DebugDiscovery.properties | 0
.../config/presets/DebugMetaModel.properties | 0
.../config/presets/DebugPersistence.properties | 0
.../presets/DebugProgrammingModel.properties | 0
.../config/presets/H2InMemory.properties | 0
.../presets/H2InMemory_withUniqueSchema.properties | 0
.../config/presets/HsqlDbInMemory.properties | 0
.../config/presets/IsisIntegTest.properties | 0
.../{ => core}/config/presets/IsisPresets.java | 2 +-
.../config/presets/NoTranslations.properties | 0
.../config/presets/SilenceMetaModel.properties | 0
.../presets/SilenceProgrammingModel.properties | 0
.../config/presets/SilenceWicket.properties | 0
.../config/presets/UseLog4j2Test.properties | 0
.../isis/{ => core}/config/util/ConfigUtil.java | 4 ++--
.../PatternOptionalStringConstraintValidator.java | 2 +-
.../config/viewer/wicket/DialogMode.java | 2 +-
.../config/viewer/wicket/WebAppConfiguration.java | 4 ++--
.../config/viewer/wicket/WebAppContextPath.java | 2 +-
.../services/javax.validation.ConstraintValidator | 2 +-
.../config/IsisConfiguration_createSubsetTest.java | 2 +-
...ion_getMaxTitleLengthInParentedTables_Test.java | 2 +-
...n_getMaxTitleLengthInStandaloneTables_Test.java | 2 +-
.../config/IsisConfiguration_primingTest.java | 2 +-
.../config/IsisConfiguration_specialCharTest.java | 2 +-
.../config/IsisConfiguration_whitespaceTest.java | 2 +-
.../config/util/ConfigUtil_isProtected_Test.java | 2 +-
.../config/util/ConfigUtil_mask_Test.java | 2 +-
.../WebAppContextPath_setContextPath_Test.java | 2 +-
.../apache/isis/metamodel/IsisModuleMetamodel.java | 2 +-
.../isis/metamodel/context/MetaModelContext.java | 2 +-
.../context/MetaModelContext_usingIoc.java | 2 +-
.../command/CommandFacetForActionAnnotation.java | 4 ++--
.../PublishedActionFacetForActionAnnotation.java | 4 ++--
.../PromptStyleFacetForActionLayoutAnnotation.java | 2 +-
...aultViewFacetForCollectionLayoutAnnotation.java | 2 +-
.../facets/fallback/FallbackFacetFactory.java | 2 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
.../object/defaults/DefaultsProviderUtil.java | 2 +-
.../annotcfg/DefaultedFacetAnnotation.java | 2 +-
.../AuditableFacetForDomainObjectAnnotation.java | 4 ++--
.../ImmutableFacetForDomainObjectAnnotation.java | 4 ++--
...lishedObjectFacetForDomainObjectAnnotation.java | 4 ++--
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...wModelLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 2 +-
...aViewModelLayoutAnnotationUsingIconUiEvent.java | 2 +-
...inObjectLayoutAnnotationUsingLayoutUiEvent.java | 2 +-
...iewModelLayoutAnnotationUsingLayoutUiEvent.java | 2 +-
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 2 +-
...ViewModelLayoutAnnotationUsingTitleUiEvent.java | 2 +-
.../recreatable/RecreatableObjectFacetFactory.java | 3 ++-
.../value/annotcfg/ValueFacetAnnotation.java | 2 +-
.../ValueSemanticsProviderAndFacetAbstract.java | 2 +-
.../value/vsp/ValueSemanticsProviderUtil.java | 2 +-
.../command/CommandFacetForPropertyAnnotation.java | 4 ++--
...ublishedPropertyFacetForPropertyAnnotation.java | 4 ++--
...romptStyleFacetForPropertyLayoutAnnotation.java | 2 +-
.../DateAndTimeValueSemanticsProviderAbstract.java | 2 +-
.../ValueSemanticsProviderAbstractTemporal.java | 2 +-
.../BigDecimalValueSemanticsProvider.java | 2 +-
.../BigIntegerValueSemanticsProvider.java | 2 +-
.../bytes/ByteValueSemanticsProviderAbstract.java | 2 +-
.../date/DateValueSemanticsProviderAbstract.java | 2 +-
.../Jdk8LocalDateValueSemanticsProvider.java | 2 +-
.../JodaLocalDateValueSemanticsProvider.java | 2 +-
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 2 +-
...fsetDateTimeValueSemanticsProviderAbstract.java | 2 +-
...JodaDateTimeValueSemanticsProviderAbstract.java | 2 +-
.../JodaLocalDateTimeValueSemanticsProvider.java | 2 +-
.../DoubleValueSemanticsProviderAbstract.java | 2 +-
.../FloatValueSemanticsProviderAbstract.java | 2 +-
.../integer/IntValueSemanticsProviderAbstract.java | 2 +-
.../longs/LongValueSemanticsProviderAbstract.java | 2 +-
.../ShortValueSemanticsProviderAbstract.java | 2 +-
.../time/TimeValueSemanticsProviderAbstract.java | 2 +-
.../TimeStampValueSemanticsProviderAbstract.java | 2 +-
.../identify/ObjectIdentifier_builtinHandlers.java | 2 +-
.../ProgrammingModelInitFilterDefault.java | 2 +-
.../metamodel/services/ServiceInjectorLegacy.java | 2 +-
.../ApplicationFeatureRepositoryDefault.java | 4 ++--
.../services/registry/ServiceRegistryDefault.java | 2 +-
.../title/TitlesAndTranslationsValidator.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 8 ++++----
.../specimpl/ObjectSpecificationAbstract.java | 4 ++--
.../validator/MetaModelValidatorAbstract.java | 2 +-
.../metamodel/MetaModelContext_forTesting.java | 6 +++---
.../action/ActionAnnotationFacetFactoryTest.java | 4 ++--
.../ActionAnnotationFacetFactoryTest_Command.java | 2 +-
...ctionAnnotationFacetFactoryTest_Publishing.java | 2 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 6 +++---
...romptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../ServiceInjectorDefaultTest_usingFields.java | 4 ++--
...InjectorDefaultTest_validateServices_happy.java | 4 ++--
.../services/ServiceInjectorLegacyTest.java | 6 +++---
.../SpecificationLoaderTestAbstract.java | 2 +-
.../runtime/context/session/RuntimeContext.java | 2 +-
.../context/session/RuntimeContextBase.java | 2 +-
.../runtime/session/IsisSessionFactoryDefault.java | 2 +-
.../session/init/IsisLocaleInitializer.java | 2 +-
.../session/init/IsisTimeZoneInitializer.java | 2 +-
.../runtimeservices/IsisModuleRuntimeServices.java | 4 ++--
.../confmenu/ConfigurationViewServiceDefault.java | 6 +++---
.../runtimeservices/email/EmailServiceDefault.java | 2 +-
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../i18n/po/TranslationServicePo.java | 2 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../standard/AuthorizationConstants.java | 2 +-
.../webapp/context/IsisWebAppCommonContext.java | 2 +-
.../isis/webapp/modules/WebModuleContext.java | 2 +-
.../templresources/TemplateResourceServlet.java | 4 ++--
.../webappctx/IsisWebAppContextInitializer.java | 4 ++--
.../demo/src/main/java/demoapp/webapp/DemoApp.java | 2 +-
.../testdomain/conf/Configuration_headless.java | 2 +-
.../testdomain/conf/Configuration_usingJdo.java | 2 +-
.../conf/Configuration_usingJdoAndShiro.java | 2 +-
.../isis/testdomain/rest/RestEndpointService.java | 4 ++--
.../testdomain/auditing/AuditerServiceTest.java | 2 +-
.../bootstrapping/AutoConfigurationTest.java | 6 +++---
.../bootstrapping/JdoBootstrappingTest.java | 2 +-
.../JdoBootstrappingTest_usingFixtures.java | 2 +-
.../SpringServiceInjectOrderTest.java | 2 +-
.../SpringServiceProvisioningTest.java | 2 +-
.../commandexecution/WrapperAsyncTest.java | 2 +-
.../commandexecution/WrapperSyncTest.java | 2 +-
.../org/apache/isis/testdomain/config/FooTest.java | 2 +-
.../isis/testdomain/config/IsisConfigBeanTest.java | 6 +++---
.../config/IsisConfigBeanTest_usingHeadless.java | 4 ++--
.../domainmodel/AnnotationSyntesizerTest.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 6 +++---
...nModelTest_usingBadDomain_noActionEnforced.java | 6 +++---
.../DomainModelTest_usingGoodDomain.java | 2 +-
.../domainmodel/SpecloaderPerformanceTest.java | 4 ++--
.../testdomain/ldap/LdapEmbeddedServerTest.java | 2 +-
.../isis/testdomain/logging/LoggerSetupTest.java | 2 +-
.../publishing/PublisherServiceTest.java | 2 +-
.../isis/testdomain/rest/RestServiceTest.java | 2 +-
.../isis/testdomain/shiro/ShiroLdapTest.java | 2 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanTest.java | 2 +-
.../transactions/TransactionRollbackTest.java | 2 +-
...TransactionRollbackTest_usingTransactional.java | 2 +-
.../isis/legacy/applib/DomainObjectContainer.java | 2 +-
.../PercentageValueSemanticsProvider.java | 2 +-
.../service/JdoPersistenceLifecycleService.java | 2 +-
.../entities/JdoEntityTypeRegistry.java | 2 +-
...eptionRecognizerCompositeForJdoObjectStore.java | 2 +-
.../metamodel/JdoProgrammingModelPlugin.java | 2 +-
.../DataNucleusApplicationComponents5.java | 2 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../persistence/PersistenceSessionFactory5.java | 4 ++--
...onRecognizerCompositeForJdoObjectStoreTest.java | 2 +-
.../shiro/authentication/AuthenticatorShiro.java | 2 +-
...AuthenticatorOrAuthorizorTest_authenticate.java | 2 +-
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 2 +-
.../h2console/ui/webmodule/WebModuleH2Console.java | 2 +-
.../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 2 +-
.../sse/ui/markup/ListeningMarkupComponent.java | 2 +-
.../markup/ListeningMarkupComponent_observing.java | 2 +-
.../webmodule/WebModuleJaxrsResteasy4.java | 2 +-
.../restfulobjects/rendering/IResourceContext.java | 2 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../service/swagger/SwaggerServiceDefault.java | 2 +-
.../service/swagger/SwaggerServiceMenu.java | 2 +-
.../resources/DomainObjectResourceServerside.java | 2 +-
.../resources/DomainServiceResourceServerside.java | 2 +-
.../resources/DomainTypeResourceServerside.java | 2 +-
.../resources/HomePageResourceServerside.java | 2 +-
.../viewer/resources/ImageResourceServerside.java | 2 +-
.../resources/MenuBarsResourceServerside.java | 4 ++--
.../viewer/resources/ResourceAbstract.java | 2 +-
.../viewer/resources/UserResourceServerside.java | 2 +-
.../resources/VersionResourceServerside.java | 2 +-
.../wicket/model/isis/WicketViewerSettings.java | 2 +-
.../serviceactions/ServiceActionUtil.java | 2 +-
.../wicket/ui/components/footer/FooterPanel.java | 4 ++--
.../wicket/ui/components/welcome/WelcomePanel.java | 2 +-
.../ui/components/widgets/favicon/Favicon.java | 2 +-
.../ui/components/widgets/navbar/BrandLogo.java | 2 +-
.../ui/components/widgets/navbar/BrandName.java | 2 +-
.../themepicker/IsisWicketThemeSupport.java | 2 +-
.../themepicker/IsisWicketThemeSupportDefault.java | 2 +-
.../widgets/themepicker/ThemeChooser.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../accmngt/signup/RegistrationFormPanel.java | 2 +-
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 2 +-
.../services/WicketViewerSettingsDefault.java | 2 +-
.../wicket/viewer/webmodule/WebModuleWicket.java | 2 +-
.../viewer/wicketapp/IsisWicketApplication.java | 2 +-
217 files changed, 271 insertions(+), 270 deletions(-)
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
index 7e81aa1..639d85e 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
@@ -4,15 +4,15 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
-import org.apache.isis.core.commons.IsisModuleCommons;
+import org.apache.isis.core.commons.IsisModuleCoreCommons;
@Configuration
@Import({
// modules
- IsisModuleCommons.class,
+ IsisModuleCoreCommons.class,
// services
ProxyFactoryServiceByteBuddy.class
})
-public class IsisModuleCodegenByteBuddy {
+public class IsisModuleCoreCodegenByteBuddy {
}
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
index b6f8268..34b7747 100644
--- a/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
@@ -10,5 +10,5 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
// @Service's
IsisSystemEnvironment.class
})
-public class IsisModuleCommons {
+public class IsisModuleCoreCommons {
}
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
rename to core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
index a8911ae..944e0c1 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/ConfigurationConstants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import java.util.List;
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 9fca5a7..10878ee 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import java.util.ArrayList;
import java.util.Collections;
@@ -45,17 +45,17 @@ import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
-import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
-import org.apache.isis.config.metamodel.facets.DefaultViewConfiguration;
-import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishPropertiesConfiguration;
-import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.config.viewer.wicket.DialogMode;
+import org.apache.isis.core.config.metamodel.facets.AuditObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandPropertiesConfiguration;
+import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
+import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishPropertiesConfiguration;
+import org.apache.isis.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
+import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.core.config.viewer.wicket.DialogMode;
import lombok.Data;
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
similarity index 82%
rename from core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
rename to core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
index d379ce4..4db74c4 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import java.util.HashMap;
import java.util.Map;
@@ -27,16 +27,16 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.commons.IsisModuleCommons;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.config.validators.PatternOptionalStringConstraintValidator;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.commons.IsisModuleCoreCommons;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.validators.PatternOptionalStringConstraintValidator;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
@Configuration
@Import({
// modules
- IsisModuleCommons.class,
+ IsisModuleCoreCommons.class,
// @Component's
IsisConfiguration.PatternsConverter.class,
diff --git a/core/config/src/main/java/org/apache/isis/config/RestEasyConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/RestEasyConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
index 4a3a3e3..dd90ee2 100644
--- a/core/config/src/main/java/org/apache/isis/config/RestEasyConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import java.util.Collections;
import java.util.Map;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index b8eb257..f2542df 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
import javax.inject.Named;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
similarity index 99%
rename from core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
index 3aa745a..6d1c0e8 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
import java.io.Serializable;
import java.util.Collection;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java
similarity index 71%
rename from core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java
index e00f3a3..7a65713 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
public interface IsisBeanTypeRegistryHolder {
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisComponentScanInterceptor.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/IsisComponentScanInterceptor.java
index c292caa..c09ff0a 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisComponentScanInterceptor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
import org.springframework.stereotype.Component;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java b/core/config/src/main/java/org/apache/isis/core/config/beans/TypeMetaData.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
rename to core/config/src/main/java/org/apache/isis/core/config/beans/TypeMetaData.java
index ba171f6..3043a46 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/TypeMetaData.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.beans;
+package org.apache.isis.core.config.beans;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.context._Context;
diff --git a/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java b/core/config/src/main/java/org/apache/isis/core/config/messages/MessageRegistry.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
rename to core/config/src/main/java/org/apache/isis/core/config/messages/MessageRegistry.java
index 8f0b282..3e9a8c3 100644
--- a/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/messages/MessageRegistry.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.config.messages;
+package org.apache.isis.core.config.messages;
import java.util.List;
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/AuditObjectsConfiguration.java
similarity index 90%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/AuditObjectsConfiguration.java
index 46d5fff..89529c9 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/AuditObjectsConfiguration.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
public enum AuditObjectsConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandActionsConfiguration.java
similarity index 91%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandActionsConfiguration.java
index a46be00..1af183a 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandActionsConfiguration.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
public enum CommandActionsConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandPropertiesConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandPropertiesConfiguration.java
index fac8729..580bbd1 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandPropertiesConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
public enum CommandPropertiesConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/DefaultViewConfiguration.java
similarity index 91%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/DefaultViewConfiguration.java
index f921ca0..4f36acd 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/DefaultViewConfiguration.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
public enum DefaultViewConfiguration {
HIDDEN(),
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java
index 8fc740c..3e7f6cd 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
public enum EditingObjectsConfiguration {
TRUE,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishActionsConfiguration.java
similarity index 91%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishActionsConfiguration.java
index 227cd36..0ce00c0 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishActionsConfiguration.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
public enum PublishActionsConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishObjectsConfiguration.java
similarity index 90%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishObjectsConfiguration.java
index 370d623..7a454ce 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishObjectsConfiguration.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
public enum PublishObjectsConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishPropertiesConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishPropertiesConfiguration.java
index 94ac649..adf757f 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishPropertiesConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
public enum PublishPropertiesConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/Util.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/Util.java
index b758caa..2ed3c79 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.facets;
+package org.apache.isis.core.config.metamodel.facets;
public final class Util {
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
similarity index 72%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
index fb09d92..e5012f5 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config.metamodel.services;
+package org.apache.isis.core.config.metamodel.services;
public enum ApplicationFeaturesInitConfiguration {
EAGER,
diff --git a/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/isis/core/config/metamodel/specloader/IntrospectionMode.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
rename to core/config/src/main/java/org/apache/isis/core/config/metamodel/specloader/IntrospectionMode.java
index 6253934..295e33a 100644
--- a/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/metamodel/specloader/IntrospectionMode.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.metamodel.specloader;
+package org.apache.isis.core.config.metamodel.specloader;
import org.apache.isis.core.commons.internal.environment.DeploymentType;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.val;
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DataNucleusAutoCreate.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DataNucleusAutoCreate.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DataNucleusAutoCreate.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DataNucleusAutoCreate.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DebugPersistence.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugPersistence.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DebugPersistence.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DebugPersistence.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/H2InMemory.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/H2InMemory.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/H2InMemory.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/H2InMemory.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/H2InMemory_withUniqueSchema.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/H2InMemory_withUniqueSchema.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/HsqlDbInMemory.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/HsqlDbInMemory.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/HsqlDbInMemory.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/HsqlDbInMemory.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/IsisIntegTest.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisIntegTest.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/IsisIntegTest.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/IsisIntegTest.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
rename to core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
index b008a6f..0221a90 100644
--- a/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.presets;
+package org.apache.isis.core.config.presets;
/**
* Supports Spring's {@code @PropertySource} annotation.
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/NoTranslations.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/NoTranslations.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/NoTranslations.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/NoTranslations.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/SilenceWicket.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceWicket.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/SilenceWicket.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/SilenceWicket.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/UseLog4j2Test.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/UseLog4j2Test.properties
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/presets/UseLog4j2Test.properties
rename to core/config/src/main/java/org/apache/isis/core/config/presets/UseLog4j2Test.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java b/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
rename to core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
index cadfcb9..5c1b146 100644
--- a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.util;
+package org.apache.isis.core.config.util;
import java.util.Map;
import java.util.function.Supplier;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.core.config.ConfigurationConstants;
import lombok.experimental.UtilityClass;
diff --git a/core/config/src/main/java/org/apache/isis/config/validators/PatternOptionalStringConstraintValidator.java b/core/config/src/main/java/org/apache/isis/core/config/validators/PatternOptionalStringConstraintValidator.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/config/validators/PatternOptionalStringConstraintValidator.java
rename to core/config/src/main/java/org/apache/isis/core/config/validators/PatternOptionalStringConstraintValidator.java
index d918440..14b53a9 100644
--- a/core/config/src/main/java/org/apache/isis/config/validators/PatternOptionalStringConstraintValidator.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/validators/PatternOptionalStringConstraintValidator.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config.validators;
+package org.apache.isis.core.config.validators;
import java.util.Optional;
import java.util.regex.Pattern;
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/DialogMode.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
rename to core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/DialogMode.java
index cb32dc1..b5768ad 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/DialogMode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.viewer.wicket;
+package org.apache.isis.core.config.viewer.wicket;
public enum DialogMode {
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
rename to core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
index 2e5c04b..c082502 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.viewer.wicket;
+package org.apache.isis.core.config.viewer.wicket;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
@@ -31,7 +31,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.Getter;
import lombok.val;
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
rename to core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
index ac9625d..6130055 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.viewer.wicket;
+package org.apache.isis.core.config.viewer.wicket;
import java.io.Serializable;
import java.util.regex.Matcher;
diff --git a/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator b/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator
index 6c0435a..a1f44ff 100644
--- a/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator
+++ b/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator
@@ -1 +1 @@
-org.apache.isis.config.validators.PatternOptionalStringConstraintValidator
\ No newline at end of file
+org.apache.isis.core.config.validators.PatternOptionalStringConstraintValidator
\ No newline at end of file
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
similarity index 98%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
index d715cb5..f5620df 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
index f66076b..049f7a1 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import org.assertj.core.api.Assertions;
import org.junit.Before;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
index 9992490..6434437 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import org.assertj.core.api.Assertions;
import org.junit.Before;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
similarity index 98%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
index a8dec28..93828cb 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
index 9e81dcb..5eb81ed 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
similarity index 98%
rename from core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
rename to core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
index 3b5078a..9ce8be5 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.core.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java b/core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_isProtected_Test.java
similarity index 98%
rename from core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_isProtected_Test.java
index bfb5874..bc86672 100644
--- a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_isProtected_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.util;
+package org.apache.isis.core.config.util;
import org.junit.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java b/core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_mask_Test.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_mask_Test.java
index 106eb96..62b4cbe 100644
--- a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_mask_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.util;
+package org.apache.isis.core.config.util;
import org.junit.Test;
diff --git a/core/config/src/test/java/org/apache/isis/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java b/core/config/src/test/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
similarity index 97%
rename from core/config/src/test/java/org/apache/isis/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
rename to core/config/src/test/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
index 9ec66da..18646a7 100644
--- a/core/config/src/test/java/org/apache/isis/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
@@ -1,4 +1,4 @@
-package org.apache.isis.config.viewer.wicket;
+package org.apache.isis.core.config.viewer.wicket;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
index 42a9bbf..dd7d186 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.IsisModuleApplib;
-import org.apache.isis.config.IsisModuleConfig;
+import org.apache.isis.core.config.IsisModuleConfig;
import org.apache.isis.metamodel.context.MetaModelContexts;
import org.apache.isis.metamodel.objectmanager.ObjectManagerDefault;
import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
index 03c3268..c47a118 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.services.homepage.HomePageAction;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
index d00dd34..0322eff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/context/MetaModelContext_usingIoc.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.ioc.IocContainer;
import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.services.ServiceUtil;
import org.apache.isis.metamodel.services.homepage.HomePageAction;
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 65cd948..2272039 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,8 +26,8 @@ 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.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandActionsConfiguration;
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;
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 af04ddc..c2367a0 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,8 +23,8 @@ import java.util.Optional;
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.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
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;
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 68b049a..c12ebdd 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.Optional;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAbstract;
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 5a5d020..a0fb3d5 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.Optional;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
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;
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 284f75e..f7eca14 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
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
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 45ee5f6..5b9bad9 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
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.MethodUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
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 419b689..1aca443 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.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
index 847a43c..41df36f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.defaults.annotcfg;
import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.defaults.DefaultedFacetAbstract;
import org.apache.isis.metamodel.facets.object.defaults.DefaultsProviderUtil;
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 c917222..cbdd630 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
@@ -23,8 +23,8 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.AuditObjectsConfiguration;
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;
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 a0eb9fc..5463cfd 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,8 +25,8 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
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 ef70659..d2ac7a6 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
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.facets.object.domainobject.publishing;
import java.util.Optional;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishObjectsConfiguration;
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;
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 b973974..ece4a84 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.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
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 c3bcf28..0c4745f 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.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.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 1854a705..0dee92a 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.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.icon.IconFacet;
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 0f0fe83..ada2285 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.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.icon.IconFacet;
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 1da5668..d426030 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.Optional;
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.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.layout.LayoutFacet;
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 db30a2b..1788335 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.Optional;
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.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.layout.LayoutFacet;
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 e500f85..b047de1 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.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.title.TitleFacet;
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 f995a58..229407d 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.core.commons.internal.base._Casts;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.title.TitleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index 3652f5d..e4437d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.ViewModel;
import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
@@ -49,7 +50,7 @@ implements MetaModelRefiner, PostConstructMethodCache {
}
/**
- * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite, org.apache.isis.config.IsisConfiguration) meta-model validation} will detect if multiple interfaces/annotations have
+ * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite, IsisConfiguration) meta-model validation} will detect if multiple interfaces/annotations have
* been attached.
*/
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
index 54f939e..a56683e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/annotcfg/ValueFacetAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.facets.object.value.annotcfg;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.ValueFacetAbstract;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
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 3e0f78b..bb1c0f3 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
@@ -31,7 +31,7 @@ import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.commons.LocaleUtil;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
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 b14d26c..50e670d 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.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
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 db730cb..bef3cf1 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,8 +26,8 @@ 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.metamodel.facets.CommandPropertiesConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandPropertiesConfiguration;
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;
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 1dfa513..9f75a35 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,8 +23,8 @@ import java.util.Optional;
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.metamodel.facets.PublishPropertiesConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishPropertiesConfiguration;
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;
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 40bb342..16beda4 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.Optional;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAbstract;
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 ca53ba0..be89177 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
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.TimeZone;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
public abstract class DateAndTimeValueSemanticsProviderAbstract<T>
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 0218d32..e5d465c 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
@@ -33,7 +33,7 @@ import java.util.TimeZone;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
index 2e6e038..e381bbb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
index 73b1f4a..a724474 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
index b047013..a6a29cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Map;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
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 609c0c0..462ca9d 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
@@ -27,7 +27,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
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 fee9048..8767291 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
@@ -28,7 +28,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
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 abccad3..ce3b184 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
@@ -32,7 +32,7 @@ import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
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 958c22b..4191719 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
@@ -31,7 +31,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
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 636597c..40fa00f 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
@@ -27,7 +27,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
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 bf2b0ec..09865b2 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
@@ -27,7 +27,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
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 fdd6d5e..8af73ea 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
@@ -33,7 +33,7 @@ import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
index d886281..7bae659 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Map;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
index ceaffa6..5918e69 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Map;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
index 70e191f..24833f2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Map;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
index cf00b92..325cd0f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Map;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
index 993d1eb..6a2e5d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Map;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
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 fbbd4e7..31777aa 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
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
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 6684242..92034ac 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
@@ -26,7 +26,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index 5f8a4f9..c04e28b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.objectmanager.identify;
import java.util.UUID;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.core.config.ConfigurationConstants;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 3988c68..a73b362 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -27,7 +27,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.progmodel.ProgrammingModel.Marker;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
index 7d57380..f9ab967 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.collections._Arrays;
import org.apache.isis.core.commons.internal.collections._Collections;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 75369bd..faacdbb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleIntValueFacet;
import org.apache.isis.metamodel.facets.all.hide.HiddenFacet;
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 a537b5f..1a95bb9 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
@@ -41,7 +41,7 @@ import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.core.commons.internal.ioc.spring._Spring;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
index 526f1f9..ab6d899 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
@@ -22,7 +22,7 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.core.commons.internal.base._Blackhole;
-import org.apache.isis.config.messages.MessageRegistry;
+import org.apache.isis.core.config.messages.MessageRegistry;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
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 e6f63e9..631798a 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
@@ -43,10 +43,10 @@ import org.apache.isis.core.commons.internal.base._Timing;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.beans.IsisBeanTypeRegistry;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 5051560..af1d268 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.commons.internal.collections._Streams;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.config.beans.IsisBeanTypeRegistry;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.commons.ClassExtensions;
import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.consent.Consent;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorAbstract.java
index 4605212..70049af 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.specloader.validator;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
index 5cb3ed2..83b1f03 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
@@ -36,9 +36,9 @@ import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.beans.IsisBeanTypeRegistry;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.objectmanager.ObjectManagerDefault;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index cd79747..7ae1746 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -28,8 +28,8 @@ import org.junit.After;
import org.junit.Before;
import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
index 1691dd0..c7bb835 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.CommandExecuteIn;
import org.apache.isis.applib.annotation.CommandPersistence;
import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.CommandActionsConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
index d0326c9..efc22b6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.commons.internal.base._Blackhole;
-import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 1621d1d..d69dd9c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.context.MetaModelContextAware;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 7f2af35..268e63f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -34,9 +34,9 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.HasUniqueId;
-import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
-import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.AuditObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
+import org.apache.isis.core.config.metamodel.facets.PublishObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
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 ce4553e..efb6d8e 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
@@ -34,7 +34,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
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;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
index 655f58d..752d23f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
@@ -37,8 +37,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisModuleConfig;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
import lombok.Getter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
index da60f06..845814c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
@@ -34,8 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisModuleConfig;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
@ActiveProfiles("test")
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
index ca8c03e..a07d795 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
@@ -37,9 +37,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisModuleConfig;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
import org.apache.isis.metamodel.specloader.InjectorMethodEvaluatorDefault;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 3e71eef..f606f14 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.i18n.TranslationService.Mode;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
index 16ff51f..b37812b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
@@ -20,7 +20,7 @@ package org.apache.isis.runtime.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.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.services.homepage.HomePageAction;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
index 1bdf2bc..5064e39 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
@@ -23,7 +23,7 @@ import java.util.function.Supplier;
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.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.services.homepage.HomePageAction;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
index 56d331b..10b14a2 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.core.commons.internal.concurrent._ConcurrentContext;
import org.apache.isis.core.commons.internal.concurrent._ConcurrentTaskList;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.context.session.RuntimeEventService;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
index 6697fcd..310de6b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.session.init;
import java.util.Locale;
import java.util.Optional;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
index f50c3e2..6d18158 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
@@ -21,7 +21,7 @@ package org.apache.isis.runtime.session.init;
import java.util.TimeZone;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index fc848ad..9aa1f11 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -21,7 +21,7 @@ package org.apache.isis.runtimeservices;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.codegen.bytebuddy.IsisModuleCodegenByteBuddy;
+import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
import org.apache.isis.runtime.IsisModuleRuntime;
import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
@@ -54,7 +54,7 @@ import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
@Import({
// modules
IsisModuleRuntime.class,
- IsisModuleCodegenByteBuddy.class,
+ IsisModuleCoreCodegenByteBuddy.class,
// @Service's
AuthenticationSessionProviderDefault.class,
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
index f2386c1..8b89cd6 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
@@ -40,9 +40,9 @@ import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.RestEasyConfiguration;
-import org.apache.isis.config.util.ConfigUtil;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.RestEasyConfiguration;
+import org.apache.isis.core.config.util.ConfigUtil;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
index df5bb0a..98a1a04 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.email.EmailService;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
index 5e875f2..483456c 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facets.actions.homepage.HomePageFacet;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
index 20eeacc..51b0301 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
@Service
@Named("isisRuntimeServices.TranslationServicePo")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index 284fffd..bdd7262 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.menu.MenuBarsLoaderService;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
index a7eb6e8..8e250b7 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.commons.internal.base._NullSafe;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.runtime.persistence.session.PersistenceSession;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
index 48b4fb0..4a1ffe6 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
+++ b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
@@ -19,7 +19,7 @@
package org.apache.isis.security.api.authorization.standard;
-import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.core.config.ConfigurationConstants;
public final class AuthorizationConstants {
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java b/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
index 294b1ac..787b53e 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
@@ -27,7 +27,7 @@ import org.springframework.transaction.support.TransactionTemplate;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.menu.MenuBarsService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
index c7155e2..327032a 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
@@ -29,7 +29,7 @@ import javax.servlet.ServletException;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
index 23f597b..b90d097 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.isis.core.commons.internal.base._Bytes;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.RestEasyConfiguration;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.RestEasyConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.metamodel.commons.InputStreamExtensions;
import org.apache.isis.metamodel.commons.ResourceUtil;
import org.apache.isis.metamodel.commons.StringExtensions;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
index e5003d5..7d85cc7 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
@@ -30,8 +30,8 @@ import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index af7e674..61160a8 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index 7fa0c77..11d1cb0 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.xactn.TransactionId;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index c48e23a..81a0773 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 06945fb..075336e 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/RestEndpointService.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/RestEndpointService.java
index a54ccf5..5fb1a5e 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/RestEndpointService.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/RestEndpointService.java
@@ -26,8 +26,8 @@ import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.client.SuppressionType;
-import org.apache.isis.config.RestEasyConfiguration;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.RestEasyConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.extensions.restclient.ResponseDigest;
import org.apache.isis.extensions.restclient.RestfulClient;
import org.apache.isis.extensions.restclient.RestfulClientConfig;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index 031fb02..8fac8c2 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -43,7 +43,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
index 3d025ff..907063e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -34,9 +34,9 @@ import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.metamodel.context.MetaModelContexts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingStereotypes;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index f926438..f21d6bc 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 022f513..e949e11 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 6ba2113..9cf143c 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.runtimeservices.message.MessageServiceDefault;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 83bc7f8..712be75 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.core.commons.internal.resources._Resources;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
index d2fa7c6..bff9772 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
@@ -41,7 +41,7 @@ import org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
index f30125b..4d119ac 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
index 878c933..82519b3 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index b9ac34e..6a04d22 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
@@ -27,9 +27,9 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisModuleConfig;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisModuleConfig;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
index 277438e..dc06be7 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
@@ -27,8 +27,8 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
index 0fdcdcd..8ace5da 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.core.commons.internal.reflection._Annotations;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.schema.metamodel.v1.DomainClassDto;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 9fac106..9c9965c 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -29,9 +29,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.spec.DomainModelException;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
index 18e135f..7c4ebd3 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
@@ -29,9 +29,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.spec.DomainModelException;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index ca76cec..9a2e069 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
index 3143c3c..617a19d 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -29,8 +29,8 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.core.commons.internal.base._Timing;
import org.apache.isis.core.commons.internal.reflection._Annotations;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
index 4ad18f5..80846d9 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
index 706ea46..0cdfbe6 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index 8e0ce0d..8b241a1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index dbc5791..47eb998 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
index 208faaa..3da2329 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index e413b27..066083e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTimeout;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index bc03993..d84f701 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleSecmanEncryptionJbcrypt;
import org.apache.isis.extensions.secman.jdo.IsisModuleSecmanPersistenceJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 46a17b9..9ebdb61 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index 0599580..f75a6f1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -32,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
index 2ad9529..b32a27c 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
@@ -47,7 +47,7 @@ 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.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.legacy.applib.filter.Filter;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
diff --git a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
index c6d90aa..4df4a55 100644
--- a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
+++ b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
import org.apache.isis.legacy.applib.value.Percentage;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index 2543ddd..7ce6d86 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.runtime.context.session.AppLifecycleEvent;
import org.apache.isis.runtime.context.session.SessionLifecycleEvent;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
index 5bb5a36..455523e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/entities/JdoEntityTypeRegistry.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import javax.jdo.annotations.PersistenceCapable;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.config.beans.IsisBeanTypeRegistry;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoMetamodelUtil;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
index 0af2f24..a5ba53c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
/**
* Convenience implementation of the {@link ExceptionRecognizer} domain service that
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
index 8bc9c02..6b75e90 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/JdoProgrammingModelPlugin.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.collections._Multimaps;
import org.apache.isis.core.commons.internal.collections._Multimaps.ListMultimap;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.object.ignore.datanucleus.RemoveDatanucleusPersistableTypesFacetFactory;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
index c5b7e64..e08d666 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
@@ -38,7 +38,7 @@ import org.datanucleus.store.schema.SchemaAwareStoreManager;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.factory.InstanceUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusLifeCycleHelper;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 3b124c0..fd23c23 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -34,7 +34,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.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.context.MetaModelContext;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index b18defd..2dd7a88 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -39,8 +39,8 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.base._Blackhole;
import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledState;
import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 09f5e7f..8376728 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
index 213de43..0ee2b3f 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
@@ -48,7 +48,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.collections._Sets;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index c8972fd..827a62e 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -35,7 +35,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index d093a82..96f01f9 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -34,7 +34,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 03af628..206c37d 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.webapp.modules.WebModuleAbstract;
import org.apache.isis.webapp.modules.WebModuleContext;
diff --git a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
index f06bd0d..b359be9 100644
--- a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
+++ b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
index 3565e12..b8c68b0 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.model.IModel;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import lombok.val;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
index 2642b64..36d42c4 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
@@ -24,7 +24,7 @@ import java.util.UUID;
import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.core.commons.internal.resources._Resources;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import static org.apache.isis.core.commons.internal.base._Strings.isNullOrEmpty;
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 559dd09..63913b1 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.config.RestEasyConfiguration;
+import org.apache.isis.core.config.RestEasyConfiguration;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsSessionFilter;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisTransactionFilterForRestfulObjects;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
index 181b1df..09f0827 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
@@ -24,7 +24,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 70fa281..991fc8a 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.domain.DomainObjectList;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
index 64fd9f3..4ae749a 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.config.RestEasyConfiguration;
+import org.apache.isis.core.config.RestEasyConfiguration;
import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.SwaggerSpecGenerator;
@Service
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
index 8362547..fa90a48 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.RestEasyConfiguration;
+import org.apache.isis.core.config.RestEasyConfiguration;
@Named("isisApplib.SwaggerServiceMenu")
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index cb4f8b1..5ae5f0b 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -50,7 +50,7 @@ import org.apache.isis.core.commons.internal.base._Bytes;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.context.MetaModelContext;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
index 2cb1fc7..8994d5a 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
index 18e3e43..7868ed5 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.metamodel.spec.ObjectSpecId;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
index afe69a4..8039d46 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
index 93f268b..31488a9 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.core.commons.internal.base._Bytes;
import org.apache.isis.core.commons.internal.resources._Resources;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
@Component
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index 4a08a9f..0dad7fb 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.links.Link;
import org.apache.isis.applib.layout.menubars.MenuBars;
import org.apache.isis.applib.services.menu.MenuBarsService;
-import org.apache.isis.config.ConfigurationConstants;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.ConfigurationConstants;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 64cdaab..344d1c5 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
index 375b553..6dc3c3b 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
@@ -29,7 +29,7 @@ import javax.ws.rs.core.Response;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
index ae2e9cf..54d6662 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
@@ -31,7 +31,7 @@ import javax.ws.rs.core.Response;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
index 3f6191a..57d6b27 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.model.isis;
import java.io.Serializable;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
public interface WicketViewerSettings extends Serializable {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index e1b4898..42719e0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.config.messages.MessageRegistry;
+import org.apache.isis.core.config.messages.MessageRegistry;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
index f85b3c5..2f36ffe 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
@@ -34,8 +34,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisConfiguration.Viewer.Wicket.Credit;
-import org.apache.isis.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.config.IsisConfiguration.Viewer.Wicket.Credit;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.ThemeChooser;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
index c31baa5..ae4a15d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
index 34da2c0..512b9ff 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.util.string.Strings;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
/**
* A component for application favorite icon
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index 5e7518b..8450d45 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebComponent;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index 377c1b1..e8fb4f0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
index 96b8051..8e6442a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.themepicker;
import java.util.List;
import org.apache.isis.core.commons.internal.factory.InstanceUtil;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
index 5295f02..cdcf541 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.core.commons.internal.base._NullSafe;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index e54dba3..6d94010 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -31,7 +31,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.core.config.IsisConfiguration;
import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.Getter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 3dbc6aa..704e881 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -62,7 +62,7 @@ import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.core.commons.internal.ioc.BeanSort;
-import org.apache.isis.config.viewer.wicket.DialogMode;
+import org.apache.isis.core.config.viewer.wicket.DialogMode;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index cd7479c..d11baac 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
index bfe3c69..e6702fc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
@@ -34,7 +34,7 @@ import org.apache.wicket.validation.validator.EmailAddressValidator;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 8678e98..6183904 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -28,7 +28,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
-import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.MessageBroker;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
index 8fa617c..8e164bd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.config.messages.MessageRegistry;
+import org.apache.isis.core.config.messages.MessageRegistry;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
index 9f6811f..8666f60 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import lombok.Getter;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index 2b209f9..8c8432a 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.webapp.modules.WebModuleAbstract;
import org.apache.isis.webapp.modules.WebModuleContext;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index ed4b3d6..a1e8de3 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -67,7 +67,7 @@ import org.wicketstuff.select2.ApplicationSettings;
import org.apache.isis.core.commons.internal.concurrent._ConcurrentContext;
import org.apache.isis.core.commons.internal.concurrent._ConcurrentTaskList;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;