You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/11/29 21:49:37 UTC
[isis] branch 2039-Redesign_of_Config updated: ISIS-2039:
reinstating the ConfigurationServiceDefault
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2039-Redesign_of_Config
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2039-Redesign_of_Config by this push:
new 75e2519 ISIS-2039: reinstating the ConfigurationServiceDefault
75e2519 is described below
commit 75e2519fa50e36edfefa1b297762573d651c061b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Nov 29 22:41:57 2018 +0100
ISIS-2039: reinstating the ConfigurationServiceDefault
also renaming packages within the 'config' module -> 'o.a.i.config'
Task-Url: https://issues.apache.org/jira/browse/ISIS-2039
---
.../isis/{core/commons => }/config/AppConfig.java | 2 +-
.../commons => }/config/AppConfigLocator.java | 4 +-
.../commons => }/config/AppManifestFinder.java | 2 +-
.../config/ConfigurationConstants.java | 18 ++++-
.../commons => }/config/IsisConfiguration.java | 18 +++--
.../config/IsisConfigurationException.java | 2 +-
.../{core/commons => }/config/NotFoundPolicy.java | 2 +-
.../{core/commons => }/config/WebAppConstants.java | 2 +-
.../builder}/IsisConfigurationBuilder.java | 8 +-
.../builder}/IsisConfigurationBuilderDefault.java | 18 ++---
.../builder}/IsisConfigurationDefault.java | 10 +--
.../builder}/ModulePackageHelper.java | 2 +-
.../builder}/PersistenceCapableTypeFinder.java | 2 +-
.../PrimerForEnvironmentVariableISIS_OPTS.java | 2 +-
.../PrimerForEnvironmentVariablesIsisPrefix.java | 2 +-
.../builder}/PrimerForServletContext.java | 12 +--
.../builder}/PrimerForSystemProperties.java | 2 +-
.../builder}/PropertiesReader.java | 4 +-
.../org/apache/isis/config/internal/_Config.java | 4 +-
.../config/internal/_Config_LifecycleResource.java | 4 +-
.../{core/commons => }/config/package-info.java | 14 ++--
.../resource/ResourceStreamSource.java | 2 +-
.../resource/ResourceStreamSourceAbstract.java | 2 +-
.../ResourceStreamSourceChainOfResponsibility.java | 2 +-
.../resource/ResourceStreamSourceComposite.java | 2 +-
...ResourceStreamSourceContextLoaderClassPath.java | 2 +-
.../ResourceStreamSourceCurrentClassClassPath.java | 2 +-
.../resource/ResourceStreamSourceFileSystem.java | 2 +-
.../resource/ResourceStreamSourceForWebInf.java | 2 +-
.../resource/ResourceStreamSource_UsingClass.java | 2 +-
.../commons => config}/resource/package-info.java | 12 +--
.../service/ConfigurationServiceDefault.java | 91 ++++++++++++++++++++++
.../ConfigurationConstants_isProtected_Test.java | 4 +-
.../config/ConfigurationConstants_mask_Test.java | 4 +-
...ConfigurationBuilder_PeekConfigurationTest.java | 5 +-
.../IsisConfigurationDefaultTest_createSubset.java | 6 +-
.../IsisConfigurationDefault_PropertNamesTest.java | 5 +-
.../IsisConfigurationDefault_WhitespaceTest.java | 4 +-
...PrimerForEnvironmentVariableISIS_OPTS_Test.java | 6 +-
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 4 +-
.../adapter/concurrency/ConcurrencyChecking.java | 2 +-
.../metamodel/facets/FacetFactoryAbstract.java | 2 +-
.../command/CommandActionsConfiguration.java | 2 +-
.../command/CommandFacetForActionAnnotation.java | 2 +-
...ctionInvocationFacetForDomainEventAbstract.java | 2 +-
.../publishing/PublishActionsConfiguration.java | 2 +-
.../PublishedActionFacetForActionAnnotation.java | 2 +-
.../PromptStyleFacetForActionLayoutAnnotation.java | 2 +-
...aultViewFacetForCollectionLayoutAnnotation.java | 2 +-
.../annotation/SortedByFacetAnnotationFactory.java | 2 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
...assFacetOnActionFromConfiguredRegexFactory.java | 2 +-
.../annotprop/CssClassFaFacetOnMemberFactory.java | 2 +-
.../ViewModelSemanticCheckingFacetFactory.java | 2 +-
.../object/defaults/DefaultsProviderUtil.java | 2 +-
.../annotcfg/DefaultedFacetAnnotation.java | 2 +-
.../auditing/AuditObjectsConfiguration.java | 2 +-
.../AuditableFacetForDomainObjectAnnotation.java | 2 +-
.../auditing/DefaultViewConfiguration.java | 2 +-
.../editing/EditingObjectsConfiguration.java | 2 +-
.../ImmutableFacetForDomainObjectAnnotation.java | 2 +-
.../publishing/PublishObjectsConfiguration.java | 2 +-
...lishedObjectFacetForDomainObjectAnnotation.java | 2 +-
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 2 +-
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 2 +-
.../object/encodeable/EncoderDecoderUtil.java | 2 +-
.../facets/object/parseable/ParserUtil.java | 2 +-
.../promptStyle/PromptStyleConfiguration.java | 2 +-
.../recreatable/RecreatableObjectFacetFactory.java | 4 +-
.../ValueSemanticsProviderAndFacetAbstract.java | 4 +-
.../value/vsp/ValueSemanticsProviderUtil.java | 2 +-
.../command/CommandFacetForPropertyAnnotation.java | 2 +-
.../command/CommandPropertiesConfiguration.java | 2 +-
.../publishing/PublishPropertiesConfiguration.java | 2 +-
...ublishedPropertyFacetForPropertyAnnotation.java | 2 +-
...romptStyleFacetForPropertyLayoutAnnotation.java | 2 +-
.../DateAndTimeValueSemanticsProviderAbstract.java | 2 +-
.../ValueSemanticsProviderAbstractTemporal.java | 2 +-
.../date/DateValueSemanticsProviderAbstract.java | 2 +-
.../Jdk8LocalDateValueSemanticsProvider.java | 2 +-
.../JodaLocalDateValueSemanticsProvider.java | 2 +-
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 2 +-
...fsetDateTimeValueSemanticsProviderAbstract.java | 2 +-
...JodaDateTimeValueSemanticsProviderAbstract.java | 2 +-
.../JodaLocalDateTimeValueSemanticsProvider.java | 2 +-
.../value/money/MoneyValueSemanticsProvider.java | 2 +-
.../PercentageValueSemanticsProvider.java | 2 +-
.../time/TimeValueSemanticsProviderAbstract.java | 2 +-
.../TimeStampValueSemanticsProviderAbstract.java | 2 +-
.../core/metamodel/progmodel/FacetFactorySet.java | 6 +-
.../progmodel/ProgrammingModelAbstract.java | 4 +-
.../core/metamodel/services/ServicesInjector.java | 2 +-
.../metamodel/specloader/ReflectorConstants.java | 4 +-
.../metamodel/specloader/ServiceInitializer.java | 2 +-
.../metamodel/specloader/SpecificationLoader.java | 2 +-
.../MetaModelValidatorForDeprecatedAbstract.java | 2 +-
.../apache/isis/core/metamodel/util/EventUtil.java | 2 +-
.../standard/AuthenticationManagerStandard.java | 2 +-
.../standard/AuthorizationConstants.java | 2 +-
.../core/runtime/optionhandler/OptionHandler.java | 2 +-
.../query/JdoQueryAnnotationFacetFactory.java | 2 +-
.../version/JdoVersionAnnotationFacetFactory.java | 2 +-
...eFacetAnnotationOrConfigurationFactoryTest.java | 2 +-
.../promptstyle/PromptStyleConfiguration_Test.java | 2 +-
...romptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 1 -
.../ImageValueSemanticsProviderAbstractTest.java | 2 +-
.../services/ServicesInjectorDefaultTest.java | 2 +-
.../specloader/ServiceInitializerTest.java | 2 +-
.../conneg/IsisPrettyPrintingProcessor.java | 2 +-
.../DataNucleusApplicationComponents4.java | 2 +-
.../persistence/PersistenceSessionFactory4.java | 2 +-
.../DataNucleusApplicationComponents5.java | 2 +-
.../persistence/PersistenceSessionFactory5.java | 2 +-
...FactoryDefaultTest_wrappedObject_transient.java | 2 +-
.../apache/isis/security/shiro/ShiroConstants.java | 2 +-
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 2 +-
.../fixtures/FixturesInstallerAbstract.java | 2 +-
.../fixtures/FixturesInstallerDelegate.java | 2 +-
.../HeadlessWithBootstrappingAbstract.java | 2 +-
.../isis/core/runtime/headless/IsisSystem.java | 2 +-
.../runtime/headless/IsisSystemBootstrapper.java | 2 +-
.../opts/OptionHandlerAdditionalProperty.java | 2 +-
.../runner/opts/OptionHandlerAppManifest.java | 4 +-
.../runner/opts/OptionHandlerConfiguration.java | 6 +-
.../runner/opts/OptionHandlerFixtureAbstract.java | 4 +-
.../runtime/runner/opts/OptionHandlerHelp.java | 2 +-
.../runner/opts/OptionHandlerInitParameters.java | 2 +-
.../runtime/runner/opts/OptionHandlerPassword.java | 2 +-
.../runner/opts/OptionHandlerSystemProperties.java | 2 +-
.../runtime/runner/opts/OptionHandlerUser.java | 2 +-
.../ServicesInstallerFromConfiguration.java | 2 +-
.../services/email/EmailServiceDefault.java | 2 +-
.../services/eventbus/EventBusServiceDefault.java | 2 +-
.../isis/core/runtime/system/SystemConstants.java | 4 +-
.../core/runtime/system/context/IsisContext.java | 13 ++--
.../system/internal/IsisLocaleInitializer.java | 2 +-
.../system/internal/IsisTimeZoneInitializer.java | 4 +-
.../system/persistence/PersistenceSession.java | 2 +-
.../system/persistence/PersistenceSessionBase.java | 2 +-
.../runtime/system/session/IsisSessionFactory.java | 2 +-
.../system/session/IsisSessionFactoryBuilder.java | 7 +-
.../IsisComponentProvider.java | 4 +-
.../core/webapp/IsisWebAppContextListener.java | 10 +--
.../auth/AuthenticationSessionStrategyDefault.java | 2 +-
.../isis/core/webapp/modules/WebModuleContext.java | 2 +-
.../IsisComponentProvider_within_Test.java | 3 +-
.../standard/AuthenticatorDefaultTest.java | 2 +-
.../restfulobjects/rendering/RendererContext.java | 2 +-
.../restfulobjects/server/ResourceContext.java | 2 +-
.../server/resources/DomainResourceHelper.java | 2 +-
.../server/resources/ResourceAbstract.java | 2 +-
.../server/ResourceContextTest_getArg.java | 2 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
.../wicket/viewer/IsisWicketApplication.java | 2 +-
.../viewer/wicket/viewer/IsisWicketModule.java | 2 +-
.../viewer/integration/isis/IsisInjectModule.java | 2 +-
.../services/TranslationsResolverWicket.java | 2 +-
.../settings/WicketViewerSettingsDefault.java | 2 +-
.../isisWicketModule_bindingsStandard_Test.java | 2 +-
.../wicket/model/models/BookmarkedPagesModel.java | 2 +-
.../models/whereami/WhereAmIModelDefault.java | 2 +-
.../wicket/ui/components/footer/FooterPanel.java | 2 +-
.../datepicker/TextFieldWithDateTimePicker.java | 2 +-
.../widgets/themepicker/ThemeChooser.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../accmngt/AccountManagementPageAbstract.java | 2 +-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 3 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 2 +-
.../org/apache/isis/core/webserver/WebServer.java | 4 +-
.../isis/core/webserver/WebServerConstants.java | 2 +-
.../webserver/config/WebServerConfigBuilder.java | 10 +--
.../webserver/internal/OptionHandlerAddress.java | 2 +-
.../core/webserver/internal/OptionHandlerPort.java | 2 +-
.../internal/OptionHandlerResourceBase.java | 2 +-
.../internal/OptionHandlerStartupMode.java | 2 +-
.../application/HelloWorldAppManifest.java | 4 +-
.../application/HelloWorldAppConfigTest.java | 4 +-
179 files changed, 379 insertions(+), 257 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/AppConfig.java b/core/config/src/main/java/org/apache/isis/config/AppConfig.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/AppConfig.java
rename to core/config/src/main/java/org/apache/isis/config/AppConfig.java
index dd4d1c3..42d076a 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/AppConfig.java
+++ b/core/config/src/main/java/org/apache/isis/config/AppConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
/**
* Entry-point for Application Bootstrapping
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/AppConfigLocator.java b/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/AppConfigLocator.java
rename to core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
index af6ec92..3127094 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/AppConfigLocator.java
+++ b/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
@@ -1,4 +1,4 @@
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -7,7 +7,7 @@ import org.apache.isis.applib.AppManifest;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.context._Plugin;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
public final class AppConfigLocator {
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/AppManifestFinder.java b/core/config/src/main/java/org/apache/isis/config/AppManifestFinder.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/AppManifestFinder.java
rename to core/config/src/main/java/org/apache/isis/config/AppManifestFinder.java
index d7a1930..c82a2c8 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/AppManifestFinder.java
+++ b/core/config/src/main/java/org/apache/isis/config/AppManifestFinder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
similarity index 84%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/ConfigurationConstants.java
rename to core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
index 92f15e2..2cf8881 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
@@ -17,9 +17,11 @@
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.commons.internal.base._Strings;
@@ -52,6 +54,18 @@ public final class ConfigurationConstants {
return isProtected(key) ? "********" : value;
}
+ public static Map<String, String> maskIfProtected(
+ final Map<String, String> inMap,
+ final Supplier<Map<String, String>> mapFactory) {
+ final Map<String, String> result = mapFactory.get();
+
+ inMap.forEach((k, v)->{
+ result.put(k, maskIfProtected(k, v));
+ });
+
+ return result;
+ }
+
// -- HELPER
private ConfigurationConstants() {}
@@ -68,5 +82,7 @@ public final class ConfigurationConstants {
}
return false;
}
+
+
}
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 7db1ab8..a0e0717 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
import java.awt.Color;
import java.awt.Font;
@@ -27,8 +27,8 @@ import java.util.Map;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.Module;
import org.apache.isis.applib.PropertyResource;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
-import org.apache.isis.core.commons.resource.ResourceStreamSource;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
+import org.apache.isis.config.resource.ResourceStreamSource;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
import static org.apache.isis.config.internal._Config.acceptBuilder;
@@ -69,6 +69,8 @@ public interface IsisConfiguration {
EXCEPTION
}
+ // -- BUILDERS
+
/**
*
* @param topModule
@@ -101,6 +103,14 @@ public interface IsisConfiguration {
return getConfiguration();
}
+ // -- VERSION
+
+ public static String getVersion() {
+ return "2.0.0-M2";
+ }
+
+ // --
+
/**
* @since 2.0.0-M2
*/
@@ -261,8 +271,6 @@ public interface IsisConfiguration {
default boolean explicitAnnotationsForActions() {
return getBoolean("isis.reflector.explicitAnnotations.action");
}
-
-
}
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationException.java b/core/config/src/main/java/org/apache/isis/config/IsisConfigurationException.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationException.java
rename to core/config/src/main/java/org/apache/isis/config/IsisConfigurationException.java
index 706d969..bd1ce25 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationException.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfigurationException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/NotFoundPolicy.java b/core/config/src/main/java/org/apache/isis/config/NotFoundPolicy.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/NotFoundPolicy.java
rename to core/config/src/main/java/org/apache/isis/config/NotFoundPolicy.java
index 0ab7b81..806d686 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/NotFoundPolicy.java
+++ b/core/config/src/main/java/org/apache/isis/config/NotFoundPolicy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
public enum NotFoundPolicy {
CONTINUE, FAIL_FAST
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/WebAppConstants.java b/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/WebAppConstants.java
rename to core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
index 1de4c3b..2a9663e 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/WebAppConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
import org.apache.isis.applib.fixtures.LogonFixture;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java b/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationBuilder.java
similarity index 93%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
rename to core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationBuilder.java
index eb321bf..e273493 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationBuilder.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.util.List;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.Module;
import org.apache.isis.applib.PropertyResource;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-import org.apache.isis.core.commons.resource.ResourceStreamSource;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.NotFoundPolicy;
+import org.apache.isis.config.resource.ResourceStreamSource;
public interface IsisConfigurationBuilder {
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilderDefault.java b/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationBuilderDefault.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilderDefault.java
rename to core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationBuilderDefault.java
index 650740a..2f931ee 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilderDefault.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationBuilderDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.io.IOException;
import java.util.Arrays;
@@ -34,15 +34,15 @@ import org.apache.isis.applib.Module;
import org.apache.isis.applib.PropertyResource;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfiguration.ContainsPolicy;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.NotFoundPolicy;
+import org.apache.isis.config.IsisConfiguration.ContainsPolicy;
+import org.apache.isis.config.resource.ResourceStreamSource;
+import org.apache.isis.config.resource.ResourceStreamSourceChainOfResponsibility;
+import org.apache.isis.config.resource.ResourceStreamSourceFileSystem;
+import org.apache.isis.config.resource.ResourceStreamSource_UsingClass;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceChainOfResponsibility;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
-import org.apache.isis.core.commons.resource.ResourceStreamSource_UsingClass;
/**
* Holds a mutable set of properties representing the configuration.
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault.java b/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault.java
rename to core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java
index 5e6b90d..b992aae 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.awt.Color;
import java.awt.Font;
@@ -38,11 +38,11 @@ import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationException;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfigurationException;
+import org.apache.isis.config.resource.ResourceStreamSource;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.resource.ResourceStreamSource;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/ModulePackageHelper.java b/core/config/src/main/java/org/apache/isis/config/builder/ModulePackageHelper.java
similarity index 99%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/ModulePackageHelper.java
rename to core/config/src/main/java/org/apache/isis/config/builder/ModulePackageHelper.java
index 5642a29..4fb5d5c 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/ModulePackageHelper.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/ModulePackageHelper.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.util.Collection;
import java.util.List;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PersistenceCapableTypeFinder.java b/core/config/src/main/java/org/apache/isis/config/builder/PersistenceCapableTypeFinder.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PersistenceCapableTypeFinder.java
rename to core/config/src/main/java/org/apache/isis/config/builder/PersistenceCapableTypeFinder.java
index 9a381d2..92472a9 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PersistenceCapableTypeFinder.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/PersistenceCapableTypeFinder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.lang.annotation.Annotation;
import java.util.LinkedHashSet;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS.java b/core/config/src/main/java/org/apache/isis/config/builder/PrimerForEnvironmentVariableISIS_OPTS.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS.java
rename to core/config/src/main/java/org/apache/isis/config/builder/PrimerForEnvironmentVariableISIS_OPTS.java
index 1ecdf34..fbf731b 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/PrimerForEnvironmentVariableISIS_OPTS.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariablesIsisPrefix.java b/core/config/src/main/java/org/apache/isis/config/builder/PrimerForEnvironmentVariablesIsisPrefix.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariablesIsisPrefix.java
rename to core/config/src/main/java/org/apache/isis/config/builder/PrimerForEnvironmentVariablesIsisPrefix.java
index 27035b9..8e3eac7 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariablesIsisPrefix.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/PrimerForEnvironmentVariablesIsisPrefix.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.util.Map;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForServletContext.java b/core/config/src/main/java/org/apache/isis/config/builder/PrimerForServletContext.java
similarity index 90%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForServletContext.java
rename to core/config/src/main/java/org/apache/isis/config/builder/PrimerForServletContext.java
index 011d507..b518f76 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForServletContext.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/PrimerForServletContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.util.Enumeration;
import java.util.Map;
@@ -28,11 +28,11 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.config.WebAppConstants;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceForWebInf;
+import org.apache.isis.config.WebAppConstants;
+import org.apache.isis.config.resource.ResourceStreamSourceContextLoaderClassPath;
+import org.apache.isis.config.resource.ResourceStreamSourceCurrentClassClassPath;
+import org.apache.isis.config.resource.ResourceStreamSourceFileSystem;
+import org.apache.isis.config.resource.ResourceStreamSourceForWebInf;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForSystemProperties.java b/core/config/src/main/java/org/apache/isis/config/builder/PrimerForSystemProperties.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForSystemProperties.java
rename to core/config/src/main/java/org/apache/isis/config/builder/PrimerForSystemProperties.java
index 9920cb7..e9921af 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForSystemProperties.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/PrimerForSystemProperties.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PropertiesReader.java b/core/config/src/main/java/org/apache/isis/config/builder/PropertiesReader.java
similarity index 92%
rename from core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PropertiesReader.java
rename to core/config/src/main/java/org/apache/isis/config/builder/PropertiesReader.java
index 53cdd67..a089148 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/configbuilder/PropertiesReader.java
+++ b/core/config/src/main/java/org/apache/isis/config/builder/PropertiesReader.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import org.apache.isis.core.commons.resource.ResourceStreamSource;
+import org.apache.isis.config.resource.ResourceStreamSource;
/**
* Loads properties using the specified {@link ResourceStreamSource}.
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config.java b/core/config/src/main/java/org/apache/isis/config/internal/_Config.java
index afcd8d7..054766c 100644
--- a/core/config/src/main/java/org/apache/isis/config/internal/_Config.java
+++ b/core/config/src/main/java/org/apache/isis/config/internal/_Config.java
@@ -22,8 +22,8 @@ import java.util.function.Consumer;
import java.util.function.Function;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
/**
* @since 2.0.0-M2
diff --git a/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java b/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
index cda5fe8..aef3c66 100644
--- a/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
+++ b/core/config/src/main/java/org/apache/isis/config/internal/_Config_LifecycleResource.java
@@ -23,8 +23,8 @@ import java.util.Optional;
import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/config/package-info.java b/core/config/src/main/java/org/apache/isis/config/package-info.java
similarity index 74%
rename from core/config/src/main/java/org/apache/isis/core/commons/config/package-info.java
rename to core/config/src/main/java/org/apache/isis/config/package-info.java
index 1066958..70bb83f 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/config/package-info.java
+++ b/core/config/src/main/java/org/apache/isis/config/package-info.java
@@ -18,23 +18,23 @@
*/
/**
- * Defines the {@link org.apache.isis.core.commons.config.IsisConfiguration}
+ * Defines the {@link org.apache.isis.config.IsisConfiguration}
* which collects an immutable set of configuration options (like a hashmap),
* along with a number of supporting classes.
*
* <p>
- * Chief among these supporting classes is {@link org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder},
+ * Chief among these supporting classes is {@link org.apache.isis.config.builder.IsisConfigurationBuilder},
* which holds a (mutable) collection of properties and is used to build an
- * {@link org.apache.isis.core.commons.config.IsisConfiguration}. The
- * {@link org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder} and
- * {@link org.apache.isis.core.commons.config.IsisConfiguration} types form
+ * {@link org.apache.isis.config.IsisConfiguration}. The
+ * {@link org.apache.isis.config.builder.IsisConfigurationBuilder} and
+ * {@link org.apache.isis.config.IsisConfiguration} types form
* an mutable/immutable pair (cf {@link java.lang.StringBuilder} / {@link java.lang.String}).
*
* <p>
- * The {@link org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder} is used
+ * The {@link org.apache.isis.config.builder.IsisConfigurationBuilder} is used
* by {@link org.apache.isis.core.commons.components.InstallerAbstract}, an
* implementation of {@link org.apache.isis.core.commons.components.Installer}
* that allows the configuration to be added to as each component is
* installed.
*/
-package org.apache.isis.core.commons.config;
\ No newline at end of file
+package org.apache.isis.config;
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSource.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSource.java
index d1d7e84..49cf8ee 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSource.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceAbstract.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceAbstract.java
index 3998c3c..e0c1512 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceChainOfResponsibility.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceChainOfResponsibility.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceChainOfResponsibility.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceChainOfResponsibility.java
index 6e3f0c2..8232fe3 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceChainOfResponsibility.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceChainOfResponsibility.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceComposite.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceComposite.java
index e3e67f1..20a5e76 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceComposite.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceContextLoaderClassPath.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceContextLoaderClassPath.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceContextLoaderClassPath.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceContextLoaderClassPath.java
index dd0115e..ad44ba8 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceContextLoaderClassPath.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceContextLoaderClassPath.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.InputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceCurrentClassClassPath.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceCurrentClassClassPath.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceCurrentClassClassPath.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceCurrentClassClassPath.java
index 0d7f422..5fc2681 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceCurrentClassClassPath.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceCurrentClassClassPath.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceFileSystem.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceFileSystem.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceFileSystem.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceFileSystem.java
index cec06d8..c72f549 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceFileSystem.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceFileSystem.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.File;
import java.io.FileInputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceForWebInf.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceForWebInf.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceForWebInf.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceForWebInf.java
index 1de3944..b2799aa 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceForWebInf.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSourceForWebInf.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource_UsingClass.java b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSource_UsingClass.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource_UsingClass.java
rename to core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSource_UsingClass.java
index c0eb0e9..09b58cb 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource_UsingClass.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/ResourceStreamSource_UsingClass.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.resource;
+package org.apache.isis.config.resource;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/config/src/main/java/org/apache/isis/core/commons/resource/package-info.java b/core/config/src/main/java/org/apache/isis/config/resource/package-info.java
similarity index 63%
rename from core/config/src/main/java/org/apache/isis/core/commons/resource/package-info.java
rename to core/config/src/main/java/org/apache/isis/config/resource/package-info.java
index d447644..a20bacf 100644
--- a/core/config/src/main/java/org/apache/isis/core/commons/resource/package-info.java
+++ b/core/config/src/main/java/org/apache/isis/config/resource/package-info.java
@@ -18,17 +18,17 @@
*/
/**
- * Provides an {@link org.apache.isis.core.commons.resource.ResourceStreamSource abstraction}
+ * Provides an {@link org.apache.isis.config.resource.ResourceStreamSource abstraction}
* over {@link java.io.InputStream}s for accessing
* resources.
*
* <p>
* The principle usage is to allow the easy searching of a single resource (eg
- * <tt>isis.properties</tt> file) in {@link org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath multiple}
- * {@link org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath locations}
- * and {@link org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem technologies}
+ * <tt>isis.properties</tt> file) in {@link org.apache.isis.config.resource.ResourceStreamSourceContextLoaderClassPath multiple}
+ * {@link org.apache.isis.config.resource.ResourceStreamSourceCurrentClassClassPath locations}
+ * and {@link org.apache.isis.config.resource.ResourceStreamSourceFileSystem technologies}
* on the classpath through
- * the use of a {@link org.apache.isis.core.commons.resource.ResourceStreamSourceChainOfResponsibility composite}
+ * the use of a {@link org.apache.isis.config.resource.ResourceStreamSourceChainOfResponsibility composite}
* pattern.
*/
-package org.apache.isis.core.commons.resource;
\ No newline at end of file
+package org.apache.isis.config.resource;
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/config/service/ConfigurationServiceDefault.java b/core/config/src/main/java/org/apache/isis/config/service/ConfigurationServiceDefault.java
new file mode 100644
index 0000000..74571e5
--- /dev/null
+++ b/core/config/src/main/java/org/apache/isis/config/service/ConfigurationServiceDefault.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.config.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.services.config.ConfigurationProperty;
+import org.apache.isis.applib.services.config.ConfigurationService;
+import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.internal._Config;
+
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+ )
+public class ConfigurationServiceDefault implements ConfigurationService {
+
+ @Override
+ public String getProperty(String name) {
+ return getProperty(name, null);
+ }
+
+ @Override
+ public String getProperty(String name, String defaultValue) {
+ return mapIfPresentElse(config.get().get(name), ConfigurationProperty::getValue, defaultValue);
+ }
+
+ @Override
+ public List<String> getPropertyNames() {
+ return new ArrayList<>(config.get().keySet());
+ }
+
+ @Override
+ public Set<ConfigurationProperty> allProperties() {
+ return new TreeSet<>(config.get().values());
+ }
+
+ // -- HELPER
+
+ private _Lazy<Map<String, ConfigurationProperty>> config = _Lazy.of(this::loadConfiguration);
+
+ private Map<String, ConfigurationProperty> loadConfiguration() {
+
+ final Map<String, ConfigurationProperty> map = new HashMap<>();
+
+ _Config.getConfiguration().asMap().forEach((k, v)->add(k, v, map));
+
+ // for convenience add some additional info to the top ...
+ add("[ Isis Version ]", IsisConfiguration.getVersion(), map);
+ add("[ Deployment Type ]", _Context.getEnvironment().getDeploymentType().name(), map);
+ add("[ Unit Testing ]", ""+_Context.getEnvironment().isUnitTesting(), map);
+
+ return map;
+ }
+
+ private static void add(String key, String value, Map<String, ConfigurationProperty> map) {
+
+ value = ConfigurationConstants.maskIfProtected(key, value);
+
+ map.put(key, new ConfigurationProperty(key, value));
+ }
+
+}
diff --git a/core/config/src/test/java/org/apache/isis/core/commons/config/ConfigurationConstants_isProtected_Test.java b/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java
similarity index 96%
rename from core/config/src/test/java/org/apache/isis/core/commons/config/ConfigurationConstants_isProtected_Test.java
rename to core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java
index 4f6d058..44f8e01 100644
--- a/core/config/src/test/java/org/apache/isis/core/commons/config/ConfigurationConstants_isProtected_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
import org.junit.Test;
+import org.apache.isis.config.ConfigurationConstants;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/core/config/src/test/java/org/apache/isis/core/commons/config/ConfigurationConstants_mask_Test.java b/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java
similarity index 93%
rename from core/config/src/test/java/org/apache/isis/core/commons/config/ConfigurationConstants_mask_Test.java
rename to core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java
index 6c1631e..e16319a 100644
--- a/core/config/src/test/java/org/apache/isis/core/commons/config/ConfigurationConstants_mask_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.config;
+package org.apache.isis.config;
import org.junit.Test;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
diff --git a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder_PeekConfigurationTest.java b/core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationBuilder_PeekConfigurationTest.java
similarity index 92%
rename from core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder_PeekConfigurationTest.java
rename to core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationBuilder_PeekConfigurationTest.java
index f198f23..6d7807d 100644
--- a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder_PeekConfigurationTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationBuilder_PeekConfigurationTest.java
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import junit.framework.TestCase;
diff --git a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefaultTest_createSubset.java b/core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefaultTest_createSubset.java
similarity index 94%
rename from core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefaultTest_createSubset.java
rename to core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefaultTest_createSubset.java
index 0272385..a103185 100644
--- a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefaultTest_createSubset.java
+++ b/core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefaultTest_createSubset.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -27,8 +27,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationDefault;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.builder.IsisConfigurationDefault;
public class IsisConfigurationDefaultTest_createSubset {
diff --git a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault_PropertNamesTest.java b/core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefault_PropertNamesTest.java
similarity index 92%
rename from core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault_PropertNamesTest.java
rename to core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefault_PropertNamesTest.java
index af42298..24b6265 100644
--- a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault_PropertNamesTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefault_PropertNamesTest.java
@@ -17,11 +17,12 @@
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.util.Properties;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.builder.IsisConfigurationDefault;
import junit.framework.TestCase;
diff --git a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault_WhitespaceTest.java b/core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefault_WhitespaceTest.java
similarity index 95%
rename from core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault_WhitespaceTest.java
rename to core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefault_WhitespaceTest.java
index eb61814..5920c80 100644
--- a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationDefault_WhitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/builder/IsisConfigurationDefault_WhitespaceTest.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import java.util.Properties;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationDefault;
+import org.apache.isis.config.builder.IsisConfigurationDefault;
import junit.framework.TestCase;
diff --git a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java b/core/config/src/test/java/org/apache/isis/config/builder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
similarity index 93%
rename from core/config/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
rename to core/config/src/test/java/org/apache/isis/config/builder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
index 3a07d5d..c24c364 100644
--- a/core/config/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/builder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.PrimerForEnvironmentVariableISIS_OPTS;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
index b945d57..cc69c24 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
@@ -32,9 +32,7 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.isis.applib.AppManifest;
-import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.AppConfigLocator;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/concurrency/ConcurrencyChecking.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/concurrency/ConcurrencyChecking.java
index 1632f6f..dbdc12b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/concurrency/ConcurrencyChecking.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/concurrency/ConcurrencyChecking.java
@@ -23,7 +23,7 @@ import java.util.concurrent.Callable;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
public enum ConcurrencyChecking {
NO_CHECK,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
index f632b49..8a4a8d2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
@@ -22,9 +22,9 @@ package org.apache.isis.core.metamodel.facets;
import java.util.List;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServicesInjectorAware;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandActionsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
index 2b63609..47bfc42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action.command;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
public enum CommandActionsConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
index 7ba09d2..709fd95 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
@@ -25,7 +25,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.services.command.CommandDtoProcessor;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
import org.apache.isis.core.metamodel.facets.actions.command.CommandFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 4ddbdf0..11aa75e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -54,10 +54,10 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.commons.lang.MethodInvocationPreprocessor;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
index cf46223..d43212a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action.publishing;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
public enum PublishActionsConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
index 96cb186..ec74b8c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
index 6f9bb4c..875a1bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleConfiguration;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
index 0285d01..b2a949f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
index 7545b7f..2912d58 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.facets.collections.sortedby.annotation;
import java.util.Comparator;
import java.util.stream.Stream;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
index 017c966..5898dd0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -32,8 +32,8 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.JdoMetamodelUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
index 0656926..bbe92d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
index 2a2815a..291e160 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
index 0446383..af0a881 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.ViewModel;
import org.apache.isis.applib.annotation.ViewModelLayout;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultsProviderUtil.java
index 2d0b714..b86a26e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultsProviderUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.defaults;
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
index 83226ea..14b162d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotation.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.defaults.annotcfg;
import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultsProviderUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
index ace08eb..aa45e6b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
public enum AuditObjectsConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
index 2c7ec3a..65669f5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
index 7c130a3..56bdb52 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
public enum DefaultViewConfiguration {
HIDDEN("hidden"),
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
index bd5fb23..078e777 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobject.editing;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
public enum EditingObjectsConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index 2305fc4..29d3b31 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
index 5ecf568..776816d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobject.publishing;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
public enum PublishObjectsConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
index 25055b9..8b0ab46 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index 7b41042..8337fa0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.CssClassUiEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index 5645e40..39d14b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.events.ui.IconUiEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index 23252c8..a680a49 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncoderDecoderUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
index 0d39402..9a08a26 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.encodeable;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
index 7fb3034..5fab758 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
@@ -23,7 +23,7 @@ import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleConfiguration.java
index 7cd034c..1ab18cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/promptStyle/PromptStyleConfiguration.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.promptStyle;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
public class PromptStyleConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index d1b864f..30fcce1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.ViewModel;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -55,7 +55,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache {
}
/**
- * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite, org.apache.isis.core.commons.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.core.metamodel.specloader.validator.MetaModelValidatorComposite, org.apache.isis.config.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/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index cd06b3a..14c2058 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -30,9 +30,9 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
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.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.LocaleUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index 48dd3a9..c6017be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -23,7 +23,7 @@ import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
index b31ef45..d9a4384 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.CommandPersistence;
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.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.action.command.CommandFacetFromConfiguration;
import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
index 7683800..c6e5477 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.properties.property.command;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
public enum CommandPropertiesConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
index 34e2742..07987e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.properties.property.publishing;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
public enum PublishPropertiesConfiguration {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
index ff82d74..eb528dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.properties.publish.PublishedPropertyFacet;
import org.apache.isis.core.metamodel.facets.properties.publish.PublishedPropertyFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
index 9b2eff9..c4f2708 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleConfiguration;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
index a850191..249e961 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.TimeZone;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 3fe8670..8e7f5d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -33,7 +33,7 @@ import java.util.TimeZone;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
index da3da52..7ac02cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
@@ -27,7 +27,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
index a2377b8..03f05eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
index 60fcc6d..f868b87 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/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.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
index 854c23f..1230e56 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
index 527857d..8fd3527 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8offset/Jdk8OffsetDateTimeValueSemanticsProviderAbstract.java
@@ -27,7 +27,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
index 3b32742..2cc6fdd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
@@ -27,7 +27,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index 0c1b19d..10c2025 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/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.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
index b54c0ee..5dcb9dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.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.applib.value.Money;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
index acb1a8c..05eea63 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
@@ -26,7 +26,7 @@ import java.text.ParseException;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.value.Percentage;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
index e005f67..3cf9116 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/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.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
index 6bacd38..bb298c9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/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.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/FacetFactorySet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/FacetFactorySet.java
index 0f8a38c..306a547 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/FacetFactorySet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/FacetFactorySet.java
@@ -21,10 +21,10 @@ package org.apache.isis.core.metamodel.progmodel;
import java.util.List;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelAbstract.java
index d683117..6249669 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelAbstract.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
index 0c13ba2..3644dd1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
@@ -41,10 +41,10 @@ import org.apache.isis.commons.internal.collections._Collections;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.collections._Multimaps;
import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
index f587d82..eca0e91 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
@@ -19,8 +19,8 @@
package org.apache.isis.core.metamodel.specloader;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ServiceInitializer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ServiceInitializer.java
index c5ec38e..10a8534 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ServiceInitializer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ServiceInitializer.java
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.MethodExtensions;
public class ServiceInitializer {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index e936438..82e667e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -31,9 +31,9 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ClassUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
index bea3c86..938dad2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.metamodel.specloader.validator;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/EventUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/EventUtil.java
index 9e9f73f..b7bd687 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/EventUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/EventUtil.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.util;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
public final class EventUtil {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
index 69b273a..9dea929 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
@@ -28,9 +28,9 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationConstants.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationConstants.java
index a499012..d7e14ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationConstants.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationConstants.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.authorization.standard;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
public final class AuthorizationConstants {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java
index 366af3c..ecdadfc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.optionhandler;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
public interface OptionHandler extends IsisConfigurationBuilder.Primer {
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
index 49d03e2..6c1af55 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
@@ -24,8 +24,8 @@ import java.util.regex.Pattern;
import javax.jdo.annotations.Queries;
import javax.jdo.annotations.Query;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.JdoMetamodelUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
index 6cb8e6d..8b0ba5a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.object.version;
import javax.jdo.annotations.Version;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.JdoMetamodelUtil;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index 593f1a6..639116a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -25,8 +25,8 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
index b2d3ace..c5f3ebc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
@@ -23,7 +23,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleConfiguration;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index 386988b..98cc1ea 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 4de4a4d..99d3a68 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -73,7 +73,6 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index aa4952f..62c29aa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -26,7 +26,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProviderAbstract;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest.java
index 95f9e87..62208f5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest.java
@@ -31,7 +31,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ServiceInitializerTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ServiceInitializerTest.java
index 91c88a3..712a3a9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ServiceInitializerTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ServiceInitializerTest.java
@@ -31,6 +31,7 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.config.IsisConfiguration;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -40,7 +41,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
index eb40181..6706bb0 100644
--- a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
+++ b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
@@ -25,7 +25,7 @@ import org.jboss.resteasy.annotations.DecorateTypes;
import org.jboss.resteasy.spi.DecoratorProcessor;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
index b573d78..8edb20d 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
@@ -37,8 +37,8 @@ import org.datanucleus.store.StoreManager;
import org.datanucleus.store.schema.SchemaAwareStoreManager;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory4.java
index 3a34b43..134c34a 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory4.java
@@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
index 3fa3287..01859cb 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
@@ -34,8 +34,8 @@ import org.datanucleus.metadata.MetaDataManager;
import org.datanucleus.store.schema.SchemaAwareStoreManager;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
index 91dd95d..b71a75a 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
@@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 82e240b..5318761 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -38,8 +38,8 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.consent.Allow;
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroConstants.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroConstants.java
index b3b61e5..36561b7 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroConstants.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroConstants.java
@@ -19,7 +19,7 @@
package org.apache.isis.security.shiro;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller;
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 911707b..5f3e278 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -31,8 +31,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
index 15c8c8d..3098bfb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public abstract class FixturesInstallerAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index 202865b..1ddc439 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.fixturescripts.events.FixturesInstalledEvent;
import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.plugins.environment.DeploymentType;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
index c5c5589..154cf6d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.Module;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.core.runtime.headless.logging.LeveledLogger;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
index f41ae22..320a0f1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
@@ -25,8 +25,8 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixtures.FixtureClock;
import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
index dc84bb6..61ac537 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.fixturescripts.FixtureScripts;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Ensure;
import org.apache.isis.core.runtime.headless.logging.LeveledLogger;
import org.apache.isis.core.runtime.headless.logging.LogConfig;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
index 7310746..ae3e9aa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
@@ -28,7 +28,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
import org.apache.isis.core.runtime.runner.Constants;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
index d7ae476..1e4c0f1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
@@ -26,8 +26,8 @@ import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
import org.apache.isis.core.runtime.runner.Constants;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
index c6602bd..90ec655 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
@@ -24,9 +24,9 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.NotFoundPolicy;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
import org.apache.isis.core.runtime.runner.Constants;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureAbstract.java
index 5f2832a..a4a339d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureAbstract.java
@@ -22,8 +22,8 @@ package org.apache.isis.core.runtime.runner.opts;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
import org.apache.isis.core.runtime.system.SystemConstants;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerHelp.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerHelp.java
index 839d331..e7d2283 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerHelp.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerHelp.java
@@ -25,7 +25,7 @@ import static org.apache.isis.core.runtime.runner.Constants.HELP_OPT;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
import org.apache.isis.core.runtime.runner.Constants;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
index 6f4793b..1ecaa9d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
index 10a43a2..fe058d6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
@@ -27,7 +27,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
import org.apache.isis.core.runtime.runner.Constants;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
index c6b40f2..c5c4654 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
index a6ccdcb..02c6eab 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
@@ -27,7 +27,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
import org.apache.isis.core.runtime.runner.Constants;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
index f0241d4..9e7034b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
@@ -30,8 +30,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.util.DeweyOrderComparator;
public class ServicesInstallerFromConfiguration extends ServicesInstallerAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
index f57da46..852cdf8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.email.EmailService;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
/**
* A service that sends email notifications when specific events occur
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
index 54536b6..fe77b25 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.plugins.eventbus.EventBusPlugin;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
index bf4699c..76b7f6c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
@@ -19,8 +19,8 @@
package org.apache.isis.core.runtime.system;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index a79c0ae..7454c9d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -27,7 +27,8 @@ import java.util.function.Supplier;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
@@ -191,10 +192,6 @@ public interface IsisContext {
return getSessionFactory().getServicesInjector();
}
- public static String getVersion() {
- return "2.0.0-M2";
- }
-
public static StringBuilder dumpConfig() {
final StringBuilder sb = new StringBuilder();
@@ -207,9 +204,11 @@ public interface IsisContext {
return sb;
}
- final Map<String, String> map = new TreeMap<>(configuration.asMap());
+ final Map<String, String> map =
+ ConfigurationConstants.maskIfProtected(configuration.asMap(), TreeMap::new);
- String head = String.format("ISIS %s (%s) ", getVersion(), IsisContext.getEnvironment().getDeploymentType().name());
+ String head = String.format("ISIS %s (%s) ",
+ IsisConfiguration.getVersion(), getEnvironment().getDeploymentType().name());
final int fillCount = 46-head.length();
final int fillLeft = fillCount/2;
final int fillRight = fillCount-fillLeft;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java
index 067860f..1c4eac4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java
@@ -24,7 +24,7 @@ import java.util.Locale;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.SystemConstants;
public class IsisLocaleInitializer {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java
index 34f07d8..eeea489 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java
@@ -24,8 +24,8 @@ import java.util.TimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
public class IsisTimeZoneInitializer {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 13c2d8d..cc69aed 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -22,8 +22,8 @@ import java.util.Map;
import javax.jdo.PersistenceManager;
import org.apache.isis.applib.query.Query;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterByIdProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
index 3cec1ca..65acee0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index 1305fc1..e8ddb61 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -31,10 +31,10 @@ import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.appmanifest.AppManifestProvider;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
index 3b9e718..69c8851 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
@@ -33,10 +33,12 @@ import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.fixtures.FixtureClock;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.applib.services.config.ConfigurationService;
import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.service.ConfigurationServiceDefault;
import org.apache.isis.core.commons.lang.ListExtensions;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -119,6 +121,9 @@ public class IsisSessionFactoryBuilder {
final ServicesInjector servicesInjector = componentProvider.provideServiceInjector();
+ // ConfigurationService
+ servicesInjector.addFallbackIfRequired(ConfigurationService.class, new ConfigurationServiceDefault());
+
// fixtureScripts
servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index a8ba6a0..31c0f1d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.isis.applib.AppManifest;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
@@ -50,8 +50,6 @@ public final class IsisComponentProvider {
// -- BUILDER - DEFAULT
public static IsisComponentProviderBuilder builder(AppManifest appManifest) {
- // ensure we the appmanifest on the config
-
return new IsisComponentProviderBuilder()
.appManifest(appManifest);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
index c630450..55f466d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
@@ -31,11 +31,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.config.AppConfigLocator;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfiguration.ContainsPolicy;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.AppConfigLocator;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.NotFoundPolicy;
+import org.apache.isis.config.IsisConfiguration.ContainsPolicy;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.webapp.modules.WebModule;
import org.apache.isis.core.webapp.modules.WebModuleContext;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
index 9a64826..7bbee21 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.config.WebAppConstants;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.WebAppConstants;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
import org.apache.isis.core.runtime.system.context.IsisContext;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
index 51f672f..6413bb6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
@@ -23,8 +23,8 @@ import java.util.stream.Stream;
import javax.servlet.ServletContext;
import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
/**
*
diff --git a/core/runtime/src/test/java/org/apache/isis/core/commons/configbuilder/IsisComponentProvider_within_Test.java b/core/runtime/src/test/java/org/apache/isis/config/builder/IsisComponentProvider_within_Test.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/commons/configbuilder/IsisComponentProvider_within_Test.java
rename to core/runtime/src/test/java/org/apache/isis/config/builder/IsisComponentProvider_within_Test.java
index 8e6e93d..7b45d1c 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/commons/configbuilder/IsisComponentProvider_within_Test.java
+++ b/core/runtime/src/test/java/org/apache/isis/config/builder/IsisComponentProvider_within_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.commons.configbuilder;
+package org.apache.isis.config.builder;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
@@ -28,6 +28,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.config.builder.ModulePackageHelper;
import org.apache.isis.core.runtime.systemusinginstallers.fixture.budget.SomeServiceToInclude;
import org.apache.isis.core.runtime.systemusinginstallers.fixture.budgetassignment.SomeServiceNotToInclude;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
index beab0b9..dd9517a 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
@@ -26,7 +26,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
index 0230cc5..42605e8 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
@@ -23,8 +23,8 @@ import java.util.List;
import javax.ws.rs.core.MediaType;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index d6fafd8..aa967db 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -36,8 +36,8 @@ import javax.ws.rs.ext.Providers;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index f4edc9f..a0e622f 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -24,8 +24,8 @@ import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.services.ServicesInjector;
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 5d0c4f5..95574e3 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -32,8 +32,8 @@ import javax.ws.rs.ext.Providers;
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.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index 2ab9c44..323cd01 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -33,8 +33,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 3c65250..204003b 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -36,8 +36,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index a853a12..c3fd038 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -71,9 +71,9 @@ import org.slf4j.LoggerFactory;
import org.wicketstuff.select2.ApplicationSettings;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Ensure;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
index fbf8655..2e1d3aa 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
@@ -29,8 +29,8 @@ import com.google.inject.name.Names;
import org.apache.isis.applib.services.email.EmailService;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisInjectModule.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisInjectModule.java
index 9f1350a..2273f75 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisInjectModule.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisInjectModule.java
@@ -24,8 +24,8 @@ import com.google.inject.Provides;
import com.google.inject.Singleton;
import org.apache.isis.applib.AppManifest;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
index 1099282..0d68991 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
@@ -31,7 +31,7 @@ import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.commons.config.WebAppConstants;
+import org.apache.isis.config.WebAppConstants;
import com.google.common.io.CharSource;
import com.google.common.io.Files;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index 6782fd9..1ad27ac 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.viewer.settings;
import com.google.inject.Singleton;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
index e77d353..879cff2 100644
--- a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
+++ b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
@@ -38,8 +38,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 4e51df8..17e21b1 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -25,10 +25,10 @@ import java.util.List;
import java.util.Objects;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index 5f19987..f148936 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.model.models.whereami;
import java.util.LinkedList;
import java.util.stream.Stream;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.util.pchain.ParentChain;
import org.apache.isis.core.runtime.system.context.IsisContext;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
index a290daa..01fb589 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
@@ -33,7 +33,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index 5ea2189..cf7a842 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -31,7 +31,7 @@ import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.convert.IConverter;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.DateConverter;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index da529f1..b24c47d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -27,6 +27,7 @@ import java.util.stream.Collectors;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -42,7 +43,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index ed3af10..0a50106 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -63,8 +63,8 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index 16106b6..a037288 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -36,7 +36,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 7dc0ca5..1b31474 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -23,6 +23,8 @@ import java.util.List;
import java.util.Set;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.IsisConfiguration;
+
import com.google.inject.name.Named;
import org.apache.wicket.Application;
@@ -39,7 +41,6 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 658e2cb..c81880a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -24,8 +24,8 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
index 57c8b49..964fbe6 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
@@ -32,8 +32,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.commons.lang.ObjectExtensions;
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java
index f83630d..47e1cb9 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.webserver;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.core.webserver.WebServer.StartupMode;
public final class WebServerConstants {
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/config/WebServerConfigBuilder.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/config/WebServerConfigBuilder.java
index 78db66d..35c4fb8 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/config/WebServerConfigBuilder.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/config/WebServerConfigBuilder.java
@@ -10,12 +10,12 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
+import org.apache.isis.config.resource.ResourceStreamSource;
+import org.apache.isis.config.resource.ResourceStreamSourceContextLoaderClassPath;
+import org.apache.isis.config.resource.ResourceStreamSourceFileSystem;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandler;
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java
index 83b57b7..4eb6543 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java
@@ -27,7 +27,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandler;
import org.apache.isis.core.webserver.WebServerConstants;
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java
index 2795298..a5f1621 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java
@@ -27,7 +27,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandler;
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java
index 4a2c965..5cca083 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java
@@ -24,7 +24,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandler;
import org.apache.isis.core.webserver.WebServerConstants;
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerStartupMode.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerStartupMode.java
index 4e7d865..4d59837 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerStartupMode.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerStartupMode.java
@@ -24,7 +24,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
+import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandler;
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
index af9668d..58aca18 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -19,8 +19,8 @@
package domainapp.application;
import org.apache.isis.applib.AppManifestAbstract2;
-import org.apache.isis.core.commons.config.AppConfig;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.AppConfig;
+import org.apache.isis.config.IsisConfiguration;
import domainapp.dom.HelloWorldModule;
diff --git a/example/application/helloworld/src/test/java/domainapp/application/HelloWorldAppConfigTest.java b/example/application/helloworld/src/test/java/domainapp/application/HelloWorldAppConfigTest.java
index 6a62e37..81e43e5 100644
--- a/example/application/helloworld/src/test/java/domainapp/application/HelloWorldAppConfigTest.java
+++ b/example/application/helloworld/src/test/java/domainapp/application/HelloWorldAppConfigTest.java
@@ -7,8 +7,8 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.isis.core.commons.config.AppConfigLocator;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.config.AppConfigLocator;
+import org.apache.isis.config.IsisConfiguration;
class HelloWorldAppConfigTest {