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 2021/01/27 14:20:48 UTC
[isis] branch master updated: ISIS-2502: house keeping: align
metamodel object type names
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 6bd36cb ISIS-2502: house keeping: align metamodel object type names
6bd36cb is described below
commit 6bd36cb86b61b3089a6acb8e12847dea24813ab9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 27 15:18:18 2021 +0100
ISIS-2502: house keeping: align metamodel object type names
---
.../isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java | 1 +
.../isis/applib/services/exceprecog/ExceptionRecognizerForType.java | 3 +++
.../org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java | 2 +-
.../java/org/apache/isis/core/metamodel/context/MetaModelContexts.java | 2 +-
.../isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java | 2 +-
.../isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java | 2 +-
.../apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java | 2 +-
.../core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java | 2 +-
.../apache/isis/core/metamodel/services/ServiceInjectorDefault.java | 2 +-
.../core/metamodel/services/appfeat/ApplicationFeatureFactory.java | 2 +-
.../services/appfeat/ApplicationFeatureRepositoryDefault.java | 2 +-
.../metamodel/services/classsubstitutor/ClassSubstitutorDefault.java | 2 +-
.../services/classsubstitutor/ClassSubstitutorForCollections.java | 2 +-
.../services/classsubstitutor/ClassSubstitutorForDomainObjects.java | 2 +-
.../metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java | 2 +-
.../isis/core/metamodel/services/events/MetamodelEventService.java | 2 +-
.../exceprecog/ExceptionRecognizerForRecoverableException.java | 2 +-
.../isis/core/metamodel/services/grid/GridLoaderServiceDefault.java | 2 +-
.../apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java | 2 +-
.../apache/isis/core/metamodel/services/grid/GridServiceDefault.java | 2 +-
.../core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java | 2 +-
.../isis/core/metamodel/services/layout/LayoutServiceDefault.java | 2 +-
.../core/metamodel/services/metamodel/MetaModelServiceDefault.java | 2 +-
.../isis/core/metamodel/services/registry/ServiceRegistryDefault.java | 2 +-
.../metamodel/services/tablecol/TableColumnOrderServiceDefault.java | 2 +-
.../apache/isis/core/metamodel/services/title/TitleServiceDefault.java | 2 +-
.../isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java | 2 +-
.../isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java | 2 +-
.../isis/core/metamodel/specloader/SpecificationLoaderDefault.java | 2 +-
.../isis/core/metamodel/valuetypes/ValueTypeProviderDefault.java | 2 +-
.../isis/core/metamodel/valuetypes/ValueTypeProviderForBuiltin.java | 2 +-
.../core/metamodel/valuetypes/ValueTypeProviderForCollections.java | 2 +-
.../org/apache/isis/core/metamodel/valuetypes/ValueTypeRegistry.java | 2 +-
.../rendering/service/swagger/SwaggerServiceDefault.java | 2 +-
.../rendering/service/swagger/internal/ClassExcluderDefault.java | 2 +-
.../rendering/service/swagger/internal/SwaggerSpecGenerator.java | 2 +-
.../rendering/service/swagger/internal/TaggerDefault.java | 2 +-
.../service/swagger/internal/ValuePropertyFactoryDefault.java | 2 +-
38 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index f4ac54e..6d5140e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -44,6 +44,7 @@ import lombok.extern.log4j.Log4j2;
* <p>
* If a messaging-parsing {@link Function} is provided through the constructor,
* then the message can be altered. Otherwise the exception's {@link Throwable#getMessage() message} is returned as-is.
+ *
*/
@Log4j2
public abstract class ExceptionRecognizerAbstract implements ExceptionRecognizer {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
index da0231c..64a8623 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
@@ -40,6 +40,9 @@ import lombok.val;
* <p>
* If a messaging-parsing {@link Function} is provided through the constructor,
* then the message can be altered. Otherwise the exception's {@link Throwable#getMessage() message} is returned as-is.
+ *
+ * @since 2.0 {@index}
+ *
*/
public class ExceptionRecognizerForType extends ExceptionRecognizerAbstract {
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
index 7d7a244..a384698 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
@@ -43,7 +43,7 @@ import lombok.NonNull;
import lombok.val;
@Service
-@Named("isisMetaModel.IsisBeanTypeRegistryImpl")
+@Named("isis.metamodel.IsisBeanTypeRegistryImpl")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContexts.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContexts.java
index af8b50d..0869fbf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContexts.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContexts.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.config.environment.IsisSystemEnvironment;
*
*/
@Configuration
-@Named("isisMetaModel.MetaModelContexts")
+@Named("isis.metamodel.MetaModelContexts")
public class MetaModelContexts {
@Bean @Singleton @Primary
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java
index 111187f..6372522 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facets.schema.ixn.v2.InteractionDtoValueFa
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
@Component
-@Named("isisMetaModel.isisSchema.MetaModelRefiner")
+@Named("isis.metamodel.isisSchema.MetaModelRefiner")
public class IsisSchemaMetaModelRefiner implements MetaModelRefiner {
@Override
public void refineProgrammingModel(ProgrammingModel programmingModel) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java
index 32b9a3d..ebd1333 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java
@@ -33,7 +33,7 @@ import org.apache.isis.schema.common.v2.ValueType;
import org.apache.isis.schema.ixn.v2.InteractionDto;
@Component
-@Named("isisMetaModel.isisSchemaValueTypeProvider")
+@Named("isis.metamodel.isisSchemaValueTypeProvider")
public class IsisSchemaValueTypeProvider implements ValueTypeProvider {
@Override
public Collection<ValueTypeDefinition> definitions() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
index 387c1df..bc1ee99 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
@@ -46,7 +46,7 @@ import lombok.val;
*
*/
@Service
-@Named("isisMetaModel.ObjectManagerDefault")
+@Named("isis.metamodel.ObjectManagerDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("DEFAULT")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 909db18..5ef1285 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -42,7 +42,7 @@ import lombok.val;
*
*/
@Component
-@Named("isisMetaModel.ProgrammingModelInitFilterDefault")
+@Named("isis.metamodel.ProgrammingModelInitFilterDefault")
public class ProgrammingModelInitFilterDefault implements ProgrammingModelInitFilter {
@Inject private IsisConfiguration configuration;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index b819515..7b86b98 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -39,7 +39,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
*
*/
@Service
-@Named("isisMetaModel.ServiceInjectorDefault")
+@Named("isis.metamodel.ServiceInjectorDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
index 314242c..665945e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
@Service
-@Named("isisMetaModel.ApplicationFeatureFactory")
+@Named("isis.metamodel.ApplicationFeatureFactory")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 0c7baef..d508c97 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -60,7 +60,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Repository
-@Named("isisMetaModel.ApplicationFeatureRepositoryDefault")
+@Named("isis.metamodel.ApplicationFeatureRepositoryDefault")
@Log4j2
public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRepository {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
index e988dec..30153f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.graph.tree.TreeAdapter;
@Component
-@Named("isisMetaModel.ClassSubstitutorDefault")
+@Named("isis.metamodel.ClassSubstitutorDefault")
@Order(OrderPrecedence.MIDPOINT)
public class ClassSubstitutorDefault extends ClassSubstitutorAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
index ee474fa..ea382b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import lombok.NonNull;
@Component
-@Named("isisMetaModel.ClassSubstitutorForCollections")
+@Named("isis.metamodel.ClassSubstitutorForCollections")
@Order(OrderPrecedence.MIDPOINT - 10)
public class ClassSubstitutorForCollections implements ClassSubstitutor {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
index 759402b..9aae6ea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
@@ -33,7 +33,7 @@ import lombok.NonNull;
import lombok.val;
@Component
-@Named("isisMetaModel.ClassSubstitutorForDomainObjects")
+@Named("isis.metamodel.ClassSubstitutorForDomainObjects")
@Order(OrderPrecedence.MIDPOINT - 20) // before ClassSubstitutorForCollections
public class ClassSubstitutorForDomainObjects implements ClassSubstitutor {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
index f6f1580..e6944a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
@@ -41,7 +41,7 @@ import lombok.extern.log4j.Log4j2;
* Aggregates all {@link ClassSubstitutor}s.
*/
@Component
-@Named("isisMetaModel.ClassSubstitutorRegistry")
+@Named("isis.metamodel.ClassSubstitutorRegistry")
@Order(OrderPrecedence.MIDPOINT)
@Log4j2
public class ClassSubstitutorRegistry {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java
index 0dd220a..d9350a1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/events/MetamodelEventService.java
@@ -44,7 +44,7 @@ import lombok.Builder;
*
*/
@Service
-@Named("isisMetaModel.MetamodelEventService")
+@Named("isis.metamodel.MetamodelEventService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException.java
index a4199e9..8b3cd6d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
* which will automatically recognize any {@link org.apache.isis.applib.RecoverableException}s.
*/
@Service
-@Named("isisMetaModel.ExceptionRecognizerForRecoverableException")
+@Named("isis.metamodel.ExceptionRecognizerForRecoverableException")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 75de6cb..7ae8827 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -45,7 +45,7 @@ import lombok.Value;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisMetaModel.GridLoaderServiceDefault")
+@Named("isis.metamodel.GridLoaderServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java
index da29e78..8ce86dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridReaderUsingJaxb.java
@@ -44,7 +44,7 @@ import org.apache.isis.commons.internal.collections._Arrays;
*
*/
@Service
-@Named("isisMetaModel.GridReaderUsingJaxb")
+@Named("isis.metamodel.GridReaderUsingJaxb")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
index b5b883f..8556090 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
@@ -42,7 +42,7 @@ import org.apache.isis.commons.internal.collections._Sets;
import lombok.val;
@Service
-@Named("isisMetaModel.GridServiceDefault")
+@Named("isis.metamodel.GridServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index 9122257..3d28ceb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -77,7 +77,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisMetaModel.GridSystemServiceBS3")
+@Named("isis.metamodel.GridSystemServiceBS3")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("BS3")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
index 1cb8c0a..b5d032f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import lombok.val;
@Service
-@Named("isisMetaModel.LayoutServiceDefault")
+@Named("isis.metamodel.LayoutServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index dfd0de1..91bdc3c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -55,7 +55,7 @@ import org.apache.isis.schema.metamodel.v2.MetamodelDto;
import lombok.val;
@Service
-@Named("isisMetaModel.MetaModelServiceDefault")
+@Named("isis.metamodel.MetaModelServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
index ee52d79..5a86197 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.config.environment.IsisSystemEnvironment;
import lombok.val;
@Service
-@Named("isisMetaModel.ServiceRegistryDefault")
+@Named("isis.metamodel.ServiceRegistryDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceDefault.java
index 0077223..3781f3c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/tablecol/TableColumnOrderServiceDefault.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
* Used as a fallback.
*/
@Service
-@Named("isisMetaModel.TableColumnOrderServiceDefault")
+@Named("isis.metamodel.TableColumnOrderServiceDefault")
@Order(OrderPrecedence.LATE)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index b0105d4..cfeed07 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -38,7 +38,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Service
-@Named("isisMetaModel.TitleServiceDefault")
+@Named("isis.metamodel.TitleServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
index f0a7986..9215706 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.spec.InjectorMethodEvaluator;
@Service
-@Named("isisMetaModel.InjectorMethodEvaluatorDefault")
+@Named("isis.metamodel.InjectorMethodEvaluatorDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java
index 77ce60b..430c296 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ProgrammingModelServiceDefault.java
@@ -41,7 +41,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisMetaModel.ProgrammingModelServiceDefault")
+@Named("isis.metamodel.ProgrammingModelServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index bb63df6..dc5260c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -98,7 +98,7 @@ import lombok.extern.log4j.Log4j2;
* </p>
*/
@Service
-@Named("isisMetaModel.SpecificationLoaderDefault")
+@Named("isis.metamodel.SpecificationLoaderDefault")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderDefault.java
index 04a611c..069a6cf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderDefault.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.util.schema.CommonDtoUtils;
import org.apache.isis.schema.common.v2.ValueType;
@Component
-@Named("isisMetaModel.ValueTypeProviderBuiltIn")
+@Named("isis.metamodel.ValueTypeProviderBuiltIn")
@Order(OrderPrecedence.MIDPOINT)
public class ValueTypeProviderDefault implements ValueTypeProvider {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForBuiltin.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForBuiltin.java
index d4a6b38..d16e264 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForBuiltin.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForBuiltin.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeature;
import org.apache.isis.schema.common.v2.ValueType;
@Component
-@Named("isisMetaModel.ValueTypeProviderForBuiltin")
+@Named("isis.metamodel.ValueTypeProviderForBuiltin")
@Order(OrderPrecedence.MIDPOINT)
public class ValueTypeProviderForBuiltin implements ValueTypeProvider {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForCollections.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForCollections.java
index dde2a3a..f393619 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForCollections.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeProviderForCollections.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.collections._Lists;
@Component
-@Named("isisMetaModel.ValueTypeProviderCollections")
+@Named("isis.metamodel.ValueTypeProviderCollections")
@Order(OrderPrecedence.MIDPOINT)
public class ValueTypeProviderForCollections implements ValueTypeProvider {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeRegistry.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeRegistry.java
index 017fa81..8b914ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeRegistry.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeRegistry.java
@@ -39,7 +39,7 @@ import org.apache.isis.schema.common.v2.ValueType;
import lombok.val;
@Component
-@Named("isisMetaModel.ValueTypeRegistry")
+@Named("isis.metamodel.ValueTypeRegistry")
@Order(OrderPrecedence.MIDPOINT)
public class ValueTypeRegistry {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
index 8094f38..dd841cc 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.
import lombok.val;
@Service
-@Named("isisMetaModel.swaggerServiceDefault")
+@Named("isis.metamodel.swaggerServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
index 0139757..f0aa7ee 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
@@ -23,7 +23,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
@Component
-@Named("isisMetaModel.ClassExcluderDefault")
+@Named("isis.metamodel.ClassExcluderDefault")
public class ClassExcluderDefault extends ClassExcluderAbstract {
public ClassExcluderDefault() {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
index 5f356db..067eb09 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
@@ -33,7 +33,7 @@ import io.swagger.util.Json;
import io.swagger.util.Yaml;
@Component
-@Named("isisMetaModel.SwaggerSpecGenerator")
+@Named("isis.metamodel.SwaggerSpecGenerator")
public class SwaggerSpecGenerator {
private final SpecificationLoader specificationLoader;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index 1ed0dd4..0a9e643 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.base._Strings;
@Component
-@Named("isisMetaModel.TaggerDefault")
+@Named("isis.metamodel.TaggerDefault")
public class TaggerDefault implements Tagger {
static Pattern tagPatternForFqcn = Pattern.compile("^.*\\.([^\\.]+)\\.([^\\.]+)$");
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
index 79bd5df..d7098e8 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
@@ -53,7 +53,7 @@ import io.swagger.models.properties.StringProperty;
import io.swagger.models.properties.UUIDProperty;
@Component
-@Named("isisMetaModel.ValuePropertyFactoryDefault")
+@Named("isis.metamodel.ValuePropertyFactoryDefault")
public class ValuePropertyFactoryDefault implements ValuePropertyFactory {
private final Map<Class<?>, Factory> propertyFactoryByClass = _Maps.newHashMap();