You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/04 17:31:57 UTC
[isis] 02/06: ISIS-2213: more reorg of isis-config
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 984f06f6344f98551314714277df3371dacb1710
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:55:40 2019 +0000
ISIS-2213: more reorg of isis-config
* moves IsisPresets to presets, and moves the classpath resources alongside and into src/main/java
* moves ConfigPropsForPropertyOrParameterLayout interface into IsisConfiguration.Viewers (better scoping, I think)
---
.../ConfigPropsForPropertyOrParameterLayout.java | 12 ----------
.../org/apache/isis/config/IsisConfiguration.java | 8 +++++++
.../presets/DataNucleusAutoCreate.properties | 0
.../isis/config}/presets/DebugDiscovery.properties | 0
.../isis/config}/presets/DebugMetaModel.properties | 0
.../config}/presets/DebugPersistence.properties | 0
.../presets/DebugProgrammingModel.properties | 0
.../isis/config}/presets/H2InMemory.properties | 0
.../presets/H2InMemory_withUniqueSchema.properties | 0
.../isis/config}/presets/HsqlDbInMemory.properties | 0
.../isis/config}/presets/IsisIntegTest.properties | 0
.../isis/config/{ => presets}/IsisPresets.java | 28 +++++++++++-----------
.../isis/config}/presets/NoTranslations.properties | 0
.../config}/presets/SilenceMetaModel.properties | 0
.../presets/SilenceProgrammingModel.properties | 0
.../isis/config}/presets/SilenceWicket.properties | 0
.../facets/fallback/FallbackFacetFactory.java | 6 ++---
.../java/demoapp/application/DemoAppManifest.java | 2 +-
.../testdomain/conf/Configuration_headless.java | 2 +-
.../testdomain/conf/Configuration_usingJdo.java | 2 +-
.../conf/Configuration_usingJdoAndShiro.java | 2 +-
.../testdomain/auditing/AuditerServiceTest.java | 2 +-
.../bootstrapping/AutoConfigurationTest.java | 2 +-
.../bootstrapping/JdoBootstrappingTest.java | 2 +-
.../JdoBootstrappingTest_usingFixtures.java | 2 +-
.../SpringServiceInjectOrderTest.java | 2 +-
.../SpringServiceProvisioningTest.java | 2 +-
.../domainmodel/AnnotationSyntesizerTest.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 2 +-
.../DomainModelTest_usingGoodDomain.java | 2 +-
.../domainmodel/SpecloaderPerformanceTest.java | 2 +-
.../isis/testdomain/logging/LoggerSetupTest.java | 2 +-
.../isis/testdomain/shiro/ShiroLdapTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 5 +---
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
.../transactions/TransactionRollbackTest.java | 2 +-
...TransactionRollbackTest_usingTransactional.java | 2 +-
37 files changed, 45 insertions(+), 52 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigPropsForPropertyOrParameterLayout.java b/core/config/src/main/java/org/apache/isis/config/ConfigPropsForPropertyOrParameterLayout.java
deleted file mode 100644
index 71a70c5..0000000
--- a/core/config/src/main/java/org/apache/isis/config/ConfigPropsForPropertyOrParameterLayout.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.apache.isis.config;
-
-import org.apache.isis.applib.annotation.LabelPosition;
-
-public interface ConfigPropsForPropertyOrParameterLayout {
- public LabelPosition getLabelPosition();
-
- /**
- * Alias for {@link #getLabelPosition()}
- */
- public LabelPosition getLabel();
-}
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 23540a0..d680a5c 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -1050,6 +1050,14 @@ public class IsisConfiguration {
private LabelPosition label = LabelPosition.NOT_SPECIFIED;
}
+ public interface ConfigPropsForPropertyOrParameterLayout {
+ public LabelPosition getLabelPosition();
+
+ /**
+ * Alias for {@link #getLabelPosition()}
+ */
+ public LabelPosition getLabel();
+ }
}
@Component
diff --git a/core/config/src/main/resources/presets/DataNucleusAutoCreate.properties b/core/config/src/main/java/org/apache/isis/config/presets/DataNucleusAutoCreate.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DataNucleusAutoCreate.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DataNucleusAutoCreate.properties
diff --git a/core/config/src/main/resources/presets/DebugDiscovery.properties b/core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DebugDiscovery.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties
diff --git a/core/config/src/main/resources/presets/DebugMetaModel.properties b/core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DebugMetaModel.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties
diff --git a/core/config/src/main/resources/presets/DebugPersistence.properties b/core/config/src/main/java/org/apache/isis/config/presets/DebugPersistence.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DebugPersistence.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DebugPersistence.properties
diff --git a/core/config/src/main/resources/presets/DebugProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DebugProgrammingModel.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties
diff --git a/core/config/src/main/resources/presets/H2InMemory.properties b/core/config/src/main/java/org/apache/isis/config/presets/H2InMemory.properties
similarity index 100%
rename from core/config/src/main/resources/presets/H2InMemory.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/H2InMemory.properties
diff --git a/core/config/src/main/resources/presets/H2InMemory_withUniqueSchema.properties b/core/config/src/main/java/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties
similarity index 100%
rename from core/config/src/main/resources/presets/H2InMemory_withUniqueSchema.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties
diff --git a/core/config/src/main/resources/presets/HsqlDbInMemory.properties b/core/config/src/main/java/org/apache/isis/config/presets/HsqlDbInMemory.properties
similarity index 100%
rename from core/config/src/main/resources/presets/HsqlDbInMemory.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/HsqlDbInMemory.properties
diff --git a/core/config/src/main/resources/presets/IsisIntegTest.properties b/core/config/src/main/java/org/apache/isis/config/presets/IsisIntegTest.properties
similarity index 100%
rename from core/config/src/main/resources/presets/IsisIntegTest.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/IsisIntegTest.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisPresets.java b/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
similarity index 59%
rename from core/config/src/main/java/org/apache/isis/config/IsisPresets.java
rename to core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
index 2f10ce9..a556c36 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.config.presets;
/**
* Supports Spring's {@code @PropertySource} annotation.
@@ -26,32 +26,32 @@ package org.apache.isis.config;
*/
public final class IsisPresets {
- public static final String NoTranslations = "classpath:/presets/NoTranslations.properties";
+ public static final String NoTranslations = "classpath:/org/apache/isis/config/presets/NoTranslations.properties";
- public static final String H2InMemory = "classpath:/presets/H2InMemory.properties";
+ public static final String H2InMemory = "classpath:/org/apache/isis/config/presets/H2InMemory.properties";
/** randomized (unique) database name, eg. to allow for concurrent testing */
- public static final String H2InMemory_withUniqueSchema = "classpath:/presets/H2InMemory_withUniqueSchema.properties";
+ public static final String H2InMemory_withUniqueSchema = "classpath:/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties";
- public static final String HsqlDbInMemory = "classpath:/presets/HsqlDbInMemory.properties";
- public static final String DataNucleusAutoCreate = "classpath:/presets/DataNucleusAutoCreate.properties";
+ public static final String HsqlDbInMemory = "classpath:/org/apache/isis/config/presets/HsqlDbInMemory.properties";
+ public static final String DataNucleusAutoCreate = "classpath:/org/apache/isis/config/presets/DataNucleusAutoCreate.properties";
- public static final String DebugPersistence = "classpath:/presets/DebugPersistence.properties";
- public static final String DebugDiscovery = "classpath:/presets/DebugDiscovery.properties";
+ public static final String DebugPersistence = "classpath:/org/apache/isis/config/presets/DebugPersistence.properties";
+ public static final String DebugDiscovery = "classpath:/org/apache/isis/config/presets/DebugDiscovery.properties";
- public static final String DebugProgrammingModel = "classpath:/presets/DebugProgrammingModel.properties";
- public static final String SilenceProgrammingModel = "classpath:/presets/SilenceProgrammingModel.properties";
+ public static final String DebugProgrammingModel = "classpath:/org/apache/isis/config/presets/DebugProgrammingModel.properties";
+ public static final String SilenceProgrammingModel = "classpath:/org/apache/isis/config/presets/SilenceProgrammingModel.properties";
- public static final String DebugMetaModel = "classpath:/presets/DebugMetaModel.properties";
- public static final String SilenceMetaModel = "classpath:/presets/SilenceMetaModel.properties";
+ public static final String DebugMetaModel = "classpath:/org/apache/isis/config/presets/DebugMetaModel.properties";
+ public static final String SilenceMetaModel = "classpath:/org/apache/isis/config/presets/SilenceMetaModel.properties";
- public static final String SilenceWicket = "classpath:/presets/SilenceWicket.properties";
+ public static final String SilenceWicket = "classpath:/org/apache/isis/config/presets/SilenceWicket.properties";
/**
* @deprecated seems no longer required anyway
*/
@Deprecated
- public static final String IsisIntegTest = "classpath:/presets/IsisIntegTest.properties";
+ public static final String IsisIntegTest = "classpath:/org/apache/isis/config/presets/IsisIntegTest.properties";
/**
* Use PROTOTYPING mode as the default. Does not override if the system-property
diff --git a/core/config/src/main/resources/presets/NoTranslations.properties b/core/config/src/main/java/org/apache/isis/config/presets/NoTranslations.properties
similarity index 100%
rename from core/config/src/main/resources/presets/NoTranslations.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/NoTranslations.properties
diff --git a/core/config/src/main/resources/presets/SilenceMetaModel.properties b/core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties
similarity index 100%
rename from core/config/src/main/resources/presets/SilenceMetaModel.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties
diff --git a/core/config/src/main/resources/presets/SilenceProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties
similarity index 100%
rename from core/config/src/main/resources/presets/SilenceProgrammingModel.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties
diff --git a/core/config/src/main/resources/presets/SilenceWicket.properties b/core/config/src/main/java/org/apache/isis/config/presets/SilenceWicket.properties
similarity index 100%
rename from core/config/src/main/resources/presets/SilenceWicket.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/SilenceWicket.properties
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
index f95e441..284f75e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.config.ConfigPropsForPropertyOrParameterLayout;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -129,12 +129,12 @@ public class FallbackFacetFactory extends FacetFactoryAbstract {
}
- private Facet newPropParamLayoutFacetIfAny(final FacetHolder facetHolder, final String layoutKey, ConfigPropsForPropertyOrParameterLayout configPropsHolder) {
+ private Facet newPropParamLayoutFacetIfAny(final FacetHolder facetHolder, final String layoutKey, IsisConfiguration.Viewers.ConfigPropsForPropertyOrParameterLayout configPropsHolder) {
final LabelPosition labelPosition = from(configPropsHolder);
return new LabelAtFacetFromLayoutConfiguration(labelPosition, facetHolder);
}
- private static LabelPosition from(ConfigPropsForPropertyOrParameterLayout configPropsHolder) {
+ private static LabelPosition from(IsisConfiguration.Viewers.ConfigPropsForPropertyOrParameterLayout configPropsHolder) {
final LabelPosition labelPosition = configPropsHolder.getLabelPosition();
if(labelPosition != LabelPosition.NOT_SPECIFIED) {
return labelPosition;
diff --git a/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java b/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
index e4e54f6..3e181c2 100644
--- a/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
+++ b/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index f4580c6..af0a1d7 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.xactn.TransactionId;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.incubator.IsisBootIncubator;
import org.apache.isis.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index fead143..ba46c8c 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 44ab63d..09ec5bf 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index fa6c8fa..b527fc1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -39,7 +39,7 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
index 9d80261..b56f025 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.MetaModelContexts;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index 2b241e7..d65c321 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -38,7 +38,7 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 517d0c2..a52f2a8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 0658dd1..cdb1855 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -38,7 +38,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.runtime.services.message.MessageServiceDefault;
//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 91052be..aa3b310 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
index 64f3fb4..04b9be4 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.commons.internal.reflection._Annotations;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.schema.metamodel.v1.DomainClassDto;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index b091489..794de40 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.spec.DomainModelException;
import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 9cd169a..35217b8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
index 1304ecf..cad8a4a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.base._Timing;
import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
index e70da5d..316c7e4 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
@@ -25,7 +25,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
index 02c82af..3156cc8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
@@ -31,7 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.ldap.LdapConstants;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index 9d49a7f..b983a71 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -26,14 +26,13 @@ import org.apache.shiro.authc.CredentialsException;
import org.apache.shiro.authc.DisabledAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
@@ -42,8 +41,6 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisBootSecmanEncryp
import org.apache.isis.extensions.secman.jdo.IsisBootSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisBootSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisBootSecmanRealmShiro;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.shiro.WebModuleShiro;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 994363a..20be472 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 6d06abb..664fd76 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -27,7 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index 06608fb..ba65fdf 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -29,7 +29,7 @@ import org.springframework.test.annotation.Commit;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;