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:56 UTC
[isis] 01/06: ISIS-2213: moves all classes in isis-config under
o.a.i.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 23b72a94238cc644c29530c5e9ac07e4057635d8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:38:09 2019 +0000
ISIS-2213: moves all classes in isis-config under o.a.i.config
---
build-core.sh | 1 +
.../org/apache/isis/config/IsisConfigModule.java | 3 +--
.../org/apache/isis/config/IsisConfiguration.java | 22 +++++++++++-----------
.../facets}/AuditObjectsConfiguration.java | 2 +-
.../facets}/CommandActionsConfiguration.java | 2 +-
.../facets}/CommandPropertiesConfiguration.java | 2 +-
.../facets}/DefaultViewConfiguration.java | 2 +-
.../facets}/EditingObjectsConfiguration.java | 2 +-
.../facets}/PublishActionsConfiguration.java | 2 +-
.../facets}/PublishObjectsConfiguration.java | 2 +-
.../facets}/PublishPropertiesConfiguration.java | 2 +-
.../metamodel/facets}/Util.java | 2 +-
.../ApplicationFeaturesInitConfiguration.java | 2 +-
.../metamodel/specloader/IntrospectionMode.java | 2 +-
.../ui => config/viewer/wicket}/DialogMode.java | 2 +-
.../viewer/wicket}/WebAppConfiguration.java | 2 +-
.../command/CommandFacetForActionAnnotation.java | 1 +
.../PublishedActionFacetForActionAnnotation.java | 1 +
.../AuditableFacetForDomainObjectAnnotation.java | 1 +
.../ImmutableFacetForDomainObjectAnnotation.java | 1 +
...lishedObjectFacetForDomainObjectAnnotation.java | 1 +
.../command/CommandFacetForPropertyAnnotation.java | 1 +
...ublishedPropertyFacetForPropertyAnnotation.java | 1 +
.../ApplicationFeatureRepositoryDefault.java | 1 +
.../specloader/SpecificationLoaderDefault.java | 1 +
.../action/ActionAnnotationFacetFactoryTest.java | 4 ++--
.../ActionAnnotationFacetFactoryTest_Command.java | 2 +-
...ctionAnnotationFacetFactoryTest_Publishing.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 6 +++---
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../wicket/ui/components/welcome/WelcomePanel.java | 2 +-
.../ui/components/widgets/favicon/Favicon.java | 2 +-
.../ui/components/widgets/navbar/BrandLogo.java | 2 +-
.../ui/components/widgets/navbar/BrandName.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../accmngt/signup/RegistrationFormPanel.java | 2 +-
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 2 +-
39 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/build-core.sh b/build-core.sh
index cd5f4e0..1e13bab 100644
--- a/build-core.sh
+++ b/build-core.sh
@@ -1,3 +1,4 @@
#!/bin/bash
+export MVN_STAGES="install"
export BATCH_MODE_FLAG=off
sh scripts/ci/build-core.sh $*
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java b/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
index 5405110..37e7cb0 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
@@ -28,11 +28,10 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
@Configuration
@Import({
- //IsisConfiguration.class // not required
IsisConfiguration.PatternsConverter.class,
IsisSystemEnvironment.class,
WebAppConfiguration.class
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 fa6e47e..23540a0 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
@@ -44,17 +44,17 @@ import org.apache.isis.applib.services.i18n.TranslationService;
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.metamodel.facets.actions.action.command.CommandActionsConfiguration;
-import org.apache.isis.metamodel.facets.actions.action.publishing.PublishActionsConfiguration;
-import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditObjectsConfiguration;
-import org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration;
-import org.apache.isis.metamodel.facets.object.domainobject.editing.EditingObjectsConfiguration;
-import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishObjectsConfiguration;
-import org.apache.isis.metamodel.facets.properties.property.command.CommandPropertiesConfiguration;
-import org.apache.isis.metamodel.facets.properties.property.publishing.PublishPropertiesConfiguration;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeaturesInitConfiguration;
-import org.apache.isis.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.viewer.wicket.ui.DialogMode;
+import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.DefaultViewConfiguration;
+import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishPropertiesConfiguration;
+import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
+import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.config.viewer.wicket.DialogMode;
import lombok.Data;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
similarity index 93%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
index cefc63f..46d5fff 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject.auditing;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
index fffb7db..a46be00 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.action.command;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
similarity index 92%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
index 72b3b19..fac8729 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.properties.property.command;
+package org.apache.isis.config.metamodel.facets;
public enum CommandPropertiesConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
index be11d80..f921ca0 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject.auditing;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
similarity index 92%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
index e67a62e..8fc740c 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject.editing;
+package org.apache.isis.config.metamodel.facets;
public enum EditingObjectsConfiguration {
TRUE,
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
index 5e1bb3c..227cd36 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.action.publishing;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
similarity index 93%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
index f0e8343..370d623 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject.publishing;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
similarity index 92%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
index 1604c90..94ac649 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.properties.property.publishing;
+package org.apache.isis.config.metamodel.facets;
public enum PublishPropertiesConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/Util.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/Util.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
index e9d299f..b758caa 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/Util.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject;
+package org.apache.isis.config.metamodel.facets;
public final class Util {
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeaturesInitConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
similarity index 73%
rename from core/config/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeaturesInitConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
index be4f14d..fb09d92 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeaturesInitConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.isis.metamodel.services.appfeat;
+package org.apache.isis.config.metamodel.services;
public enum ApplicationFeaturesInitConfiguration {
EAGER,
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
index efbdf60..b9bf8a1 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.config.metamodel.specloader;
import org.apache.isis.commons.internal.environment.DeploymentType;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
diff --git a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java
rename to core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
index 107e6cf..cb32dc1 100644
--- a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui;
+package org.apache.isis.config.viewer.wicket;
public enum DialogMode {
diff --git a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
index 62812a0..d6f88b6 100644
--- a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui;
+package org.apache.isis.config.viewer.wicket;
import java.util.Optional;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
index c44ab7d..65cd948 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
@@ -27,6 +27,7 @@ import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
import org.apache.isis.metamodel.facets.actions.command.CommandFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
index c5ec65f..af04ddc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
@@ -24,6 +24,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
index dff66fa..fe55eb9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
@@ -24,6 +24,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index 2c17f1c..00bc18c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -26,6 +26,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
index 6d58354..ef70659 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet;
import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
index 7b1a903..db730cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
@@ -27,6 +27,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration;
import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
index 0826ae5..1dfa513 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
@@ -24,6 +24,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishPropertiesConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet;
import org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index b179fb4..9f4b848 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -29,6 +29,7 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.SemanticsOf;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index ff7e1d4..a940955 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -37,6 +37,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.config.registry.types.IsisBeanTypeRegistry;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 22809e7..7c3f838 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -29,8 +29,8 @@ import org.junit.Before;
import org.apache.isis.applib.services.HasUniqueId;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.metamodel.facets.actions.action.command.CommandActionsConfiguration;
-import org.apache.isis.metamodel.facets.actions.action.publishing.PublishActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
index 021988e..d047883 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.action.command.CommandActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetForActionAnnotationAsConfigured;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
index 2f35504..d604ef5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.action.publishing.PublishActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration;
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 8bfe0b3..0d00064 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -36,17 +36,17 @@ import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.metamodel.facets.object.autocomplete.AutoCompleteFacet;
-import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotationAsConfigured;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetFromConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.choices.ChoicesFacetForDomainObjectAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobject.editing.EditingObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetFromConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.recreatable.RecreatableObjectFacetForDomainObjectAnnotation;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
index 736aefd..83f8883 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.menu.MenuBarsLoaderService;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
index 700f50b..87082cd 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
@@ -24,7 +24,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
index da4ac6f..34da2c0 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.util.string.Strings;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
/**
* A component for application favorite icon
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index e4cc2b5..5e7518b 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebComponent;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index 5b34ff5..377c1b1 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 1d9cd4a..ff8b5c0 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -75,7 +75,7 @@ import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.DialogMode;
+import org.apache.isis.config.viewer.wicket.DialogMode;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.components.actionprompt.ActionPromptModalWindow;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index 5be8994..5131de4 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -24,7 +24,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
/**
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
index 3f51944..b6abbe8 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
@@ -35,7 +35,7 @@ import org.apache.wicket.validation.validator.EmailAddressValidator;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 378ff4b..73afb0e 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -34,7 +34,7 @@ import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
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.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.components.tree.themes.TreeThemeProvider;
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 69b12c8..b091489 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
@@ -30,7 +30,7 @@ import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.spec.DomainModelException;
-import org.apache.isis.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;