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 2018/12/18 08:15:19 UTC

[isis] branch ISIS-2050 updated (c6b231e -> c29c565)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch ISIS-2050
in repository https://gitbox.apache.org/repos/asf/isis.git.


 discard c6b231e  ISIS-2050: uses simpler overload that defaults IntrospectionState to TYPE_INTROSPECTED.
 discard 4d5ea0c  ISIS-2050: only contribute to entities and view models; improves MetaModel exporter
 discard 27bd4d3  ISIS-2050: load specs only to TYPE (not MEMBERS) everywhere; only adds described as facet (derived from type) if is do-op.
 discard da2219e  ISIS-2050: fixes for unit tests and reorder introspection slightly in order to fix lockdown
 discard 3c24239  ISIS-2050: adds ValueFacet for Joda LocalTime
 discard 5326283  ISIS-2050:
 discard 37964d8  ISIS-2050: introduces config property to enable/disable full introspection of metamodel
 discard b66a4ef  ISIS-2050: moves introspectObjectSpecId() so called directly from constructor of ObjectSpec.
 discard fc453c2  ISIS-2050: postProcessor now called by ObjectSpecAbstract after fully introspected, rather than by SpecificationLoader
 discard aae73f3  ISIS-2050: passes PostProcessor into ObjectSpecificationAbstract's constructor
 discard 23ed762  ISIS-2050: scales back the depth of introspection when introspecting members
 discard dbc251b  ISIS-2050: removes SpecificationLoader#state; now responsibility of each ObjectSpecification to keep track of its own introspectionState.
 discard 677d39a  ISIS-2050: eagerly introspects contributing specs, lazily introspecs the remainder.
 discard 6c2f032  ISIS-2050: updates AppManifest.Registry to also hold all contributingDomainServiceTypes
 discard f0d85a5  ISIS-2050: when traversing type hierarchy, now only introspect super types up to the TYPE, not their MEMBERs as well.
 discard 9927bde  ISIS-2050: renames two of the IntrospectionStates
 discard 01d0309  ISIS-2050: pulls upTo introspectionState into a parameter for all of SpecificationLoaders methods
 discard 34a56c1  ISIS-2050: extends IntrospectionState with additional states for type vs member introspection; inlining methods to simplify
 discard ec57814  ISIS-2050: breaks out introspectTypeHierarchyAndMembers into two.
 discard d352736  ISIS-2050: replaces IntrospectionStrategy with the concept of introspecting "up to" a certain state.
 discard 1c9b38e  ISIS-2050: refactors responsibilities of SpecLoader vs ObjectSpec
 discard 9f4aed0  ISIS-2050: introduces ObjectSpecIdFacetFactory
     new c29c565  ISIS-2050: reworks order and depth of introspection.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c6b231e)
            \
             N -- N -- N   refs/heads/ISIS-2050 (c29c565)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


[isis] 01/01: ISIS-2050: reworks order and depth of introspection.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2050
in repository https://gitbox.apache.org/repos/asf/isis.git

commit c29c565cdd45a0a56c481f5fe1cd882285309fd3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 18 08:12:50 2018 +0000

    ISIS-2050: reworks order and depth of introspection.
    
    Squashed from previous commits:
    
        ISIS-2050: uses simpler overload that defaults IntrospectionState to TYPE_INTROSPECTED.
    
        Also introduces overload for className as well as Class<?>
    
        ISIS-2050: only contribute to entities and view models; improves MetaModel exporter
    
        to also dump out the facets of any "discovered" domain types.
    
        ISIS-2050: load specs only to TYPE (not MEMBERS) everywhere; only adds described as facet (derived from type) if is do-op.
    
        ISIS-2050: fixes for unit tests and reorder introspection slightly in order to fix lockdown
    
        ISIS-2050: adds ValueFacet for Joda LocalTime
    
        Uses a very simple implementation, because I suspect that the other capabilities of ValueFacet simply aren't needed anymore...
    
        ISIS-2050:
    
        - removes contributingDomainServiceTypes from AppManifest.Registry once more ... will just eagerly introspect type and members for all domain services
        - fixes introspectUpTo algorithm
        - skip type hierarchy traversal for domain services with natureOfService=DOMAIN
        - improves/reduces logging
        - lazily introspect up to type and members whenever any of the members (properties/collections/actions) are referenced of an ObjectSpecAbstract
    
        ISIS-2050: introduces config property to enable/disable full introspection of metamodel
    
        If disabled, then metamodel validation is skipped
    
        ISIS-2050: moves introspectObjectSpecId() so called directly from constructor of ObjectSpec.
    
        ISIS-2050: postProcessor now called by ObjectSpecAbstract after fully introspected, rather than by SpecificationLoader
    
        ISIS-2050: passes PostProcessor into ObjectSpecificationAbstract's constructor
    
        ISIS-2050: scales back the depth of introspection when introspecting members
    
        - only need to introspect the type for parameters and return types.
    
        ISIS-2050: removes SpecificationLoader#state; now responsibility of each ObjectSpecification to keep track of its own introspectionState.
    
        ISIS-2050: eagerly introspects contributing specs, lazily introspecs the remainder.
    
        ISIS-2050: updates AppManifest.Registry to also hold all contributingDomainServiceTypes
    
        This is so that we can eagerly build the ObjectSpecs for these types and mixins, but leave everything else to be built lazily.
    
        ISIS-2050: when traversing type hierarchy, now only introspect super types up to the TYPE, not their MEMBERs as well.
    
        ISIS-2050: renames two of the IntrospectionStates
    
        ISIS-2050: pulls upTo introspectionState into a parameter for all of SpecificationLoaders methods
    
        ... so that the caller can decide the level of introspection that needs to be performed.
    
        ISIS-2050: extends IntrospectionState with additional states for type vs member introspection; inlining methods to simplify
    
        ... with the aim of exposing the IntrospectionState upTo so can pass through and honour the phases.
    
        Removed the guards in introspectTypeHierarchy, don't think they are needed any more since only ever called from its caller which checks the introspectionState anyway
    
        ISIS-2050: breaks out introspectTypeHierarchyAndMembers into two.
    
        ISIS-2050: replaces IntrospectionStrategy with the concept of introspecting "up to" a certain state.
    
        ISIS-2050: refactors responsibilities of SpecLoader vs ObjectSpec
    
        just the management of introspectionState on ObjectSpec
    
        ISIS-2050: introduces ObjectSpecIdFacetFactory
    
        and additional process(ProcessObjectSpecIdContext) for FacetProcessor
---
 .../java/org/apache/isis/applib/AppManifest.java   |   2 +
 .../isis/core/commons/config/ConfigProperty.java   |   5 +
 .../commons/config/ConfigPropertyAbstract.java     |  11 +
 .../core/commons/config/ConfigPropertyBoolean.java |  10 +
 .../commons/config/IsisConfigurationDefault.java   |   6 +-
 .../metamodel/facets/ObjectSpecIdFacetFactory.java |  19 ++
 .../actions/layout/ActionLayoutFacetFactory.java   |   3 +-
 ...dFacetDerivedFromDomainServiceFacetFactory.java |   1 +
 ...uFacetDerivedFromDomainServiceFacetFactory.java |   2 +-
 .../DomainObjectAnnotationFacetFactory.java        |  45 +--
 .../method/HiddenObjectFacetViaMethodFactory.java  |   4 +-
 ...jectSpecIdFacetDerivedFromClassNameFactory.java |  29 +-
 ...tyDerivedFromRecreatableObjectFacetFactory.java |   1 +
 ...ObjectFacetDeclarativeInitializingAbstract.java |   2 +-
 .../facets/object/value/ValueFacetSimple.java}     |  34 +-
 .../method/ActionChoicesFacetViaMethod.java        |   2 +-
 .../MaskFacetOnParameterAnnotationFactory.java     |   5 +-
 ...ropertyChoicesFacetDerivedFromChoicesFacet.java |   2 +-
 .../MaskFacetOnPropertyAnnotationFactory.java      |   5 +-
 .../JodaLocalTimeValueFacetSimpleFactory.java      |  47 +++
 .../param/DeriveFacetsPostProcessor.java           |   8 +-
 .../services/metamodel/MetaModelExporter.java      |  17 +-
 .../metamodel/MetaModelServiceDefault.java         |   6 +-
 .../specloader/SpecificationCacheDefault.java      |  31 +-
 .../metamodel/specloader/SpecificationLoader.java  | 363 +++++++++------------
 .../classsubstitutor/ClassSubstitutor.java         |  12 +-
 .../specloader/facetprocessor/FacetProcessor.java  |  26 +-
 .../specloader/specimpl/FacetedMethodsBuilder.java |  54 +--
 .../specloader/specimpl/IntrospectionState.java    |  43 +++
 .../specimpl/ObjectActionParameterAbstract.java    |   6 +-
 .../specloader/specimpl/ObjectMemberAbstract.java  |   6 +-
 .../specimpl/ObjectSpecificationAbstract.java      | 172 ++++++----
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  90 ++---
 .../ObjectSpecificationOnStandaloneList.java       |  17 +-
 .../JdoDiscriminatorAnnotationFacetFactory.java    |  47 ++-
 ...doPersistenceCapableAnnotationFacetFactory.java |  12 +-
 .../facets/object/query/VisitorForFromClause.java  |   1 +
 .../object/query/VisitorForVariablesClause.java    |   4 +-
 .../dflt/ProgrammingModelFacetsJava5.java          |   2 +
 ...tionLayoutAnnotationFacetFactoryJunit4Test.java |   1 +
 ...etDerivedFromDomainServiceFacetFactoryTest.java |   1 +
 ...etDerivedFromDomainServiceFacetFactoryTest.java |   1 +
 .../ObjectTypeAnnotationFacetFactoryTest.java      |  11 +-
 ...SpecIdFacetDerivedFromClassNameFactoryTest.java |   9 +-
 .../PropertyAnnotationFacetFactoryTest.java        |   1 +
 .../ObjectReflectorDefaultTest_object.java         |   2 +-
 .../specloader/SpecificationLoaderTest_array.java  |   3 +-
 .../SpecificationLoaderTest_collection.java        |   3 +-
 .../specloader/SpecificationLoaderTest_value.java  |   3 +-
 .../IntrospectionState_comparable_Test.java        |  72 ++++
 ...JdoDiscriminatorAnnotationFacetFactoryTest.java |   7 +-
 ...rsistenceCapableAnnotationFacetFactoryTest.java |  10 +
 .../apache/isis/core/runtime/memento/Memento.java  |   2 +-
 .../runner/opts/OptionHandlerInitParameters.java   |   4 +-
 .../DataNucleusApplicationComponents.java          |   3 +-
 .../persistence/PersistenceQueryFactory.java       |   9 +-
 .../system/session/IsisSessionFactoryBuilder.java  |   2 +-
 .../IsisComponentProvider.java                     |  38 ++-
 .../wicket/viewer/IsisWicketApplication.java       |  12 +-
 ...FactoryDefaultTest_wrappedObject_transient.java |   4 +-
 ...ication.services.homepage.HomePageViewModel.xml |   1 -
 ...ainapp.modules.simple.dom.impl.SimpleObject.xml |   7 -
 ...inapp.modules.simple.dom.impl.SimpleObjects.xml |   3 -
 .../integtests/mml/approved/java.lang.Long.xml     |  64 +++-
 .../integtests/mml/approved/java.lang.Object.xml   |  42 ++-
 .../integtests/mml/approved/java.lang.String.xml   |  56 +++-
 .../integtests/mml/approved/java.net.URL.xml       |  62 +++-
 .../integtests/mml/approved/java.sql.Timestamp.xml |  53 ++-
 .../integtests/mml/approved/java.util.List.xml     |  44 ++-
 .../integtests/mml/approved/java.util.Set.xml      |   2 +
 ...s.applib.annotation.Bulk$InteractionContext.xml |  50 +++
 ....applib.services.layout.LayoutService$Style.xml |  66 +++-
 .../approved/org.apache.isis.applib.value.Clob.xml |  51 ++-
 .../application/integtests/mml/approved/void.xml   |  42 ++-
 .../src/main/webapp/WEB-INF/logging.properties     |  10 +-
 75 files changed, 1380 insertions(+), 523 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
index ba1d991..8bd09bb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
@@ -199,6 +199,8 @@ public interface AppManifest {
         private Set<Class<?>> mixinTypes;
 
         /**
+         * Along with {@link #getDomainServiceTypes()}, these are introspected eagerly.
+         *
          * @return <tt>null</tt> if no appManifest is defined
          */
         public Set<Class<?>> getMixinTypes() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigProperty.java
new file mode 100644
index 0000000..bfd44a7
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigProperty.java
@@ -0,0 +1,5 @@
+package org.apache.isis.core.commons.config;
+
+public interface ConfigProperty<T> {
+    T from(final IsisConfiguration configuration);
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyAbstract.java
new file mode 100644
index 0000000..40d9487
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyAbstract.java
@@ -0,0 +1,11 @@
+package org.apache.isis.core.commons.config;
+
+public abstract class ConfigPropertyAbstract<T> implements ConfigProperty<T> {
+    final String key;
+    final boolean defaultValue;
+    public ConfigPropertyAbstract(final String key, final boolean defaultValue) {
+        this.key = key;
+        this.defaultValue = defaultValue;
+    }
+    public abstract T from(final IsisConfiguration configuration);
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyBoolean.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyBoolean.java
new file mode 100644
index 0000000..044fa35
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyBoolean.java
@@ -0,0 +1,10 @@
+package org.apache.isis.core.commons.config;
+
+public class ConfigPropertyBoolean extends ConfigPropertyAbstract<Boolean> {
+    public ConfigPropertyBoolean(final String key, final boolean defaultValue) {
+        super(key, defaultValue);
+    }
+    public Boolean from(final IsisConfiguration configuration) {
+        return configuration.getBoolean(key, defaultValue);
+    }
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
index acd2d76..9235c23 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
@@ -161,10 +161,10 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
         if (properties.containsKey(key)) {
             switch (policy) {
             case IGNORE:
-                LOG.info("ignoring {}={} as value already set (with {})", key, value, properties.get(key));
+                LOG.debug("ignoring {}={} as value already set (with {})", key, value, properties.get(key));
                 break;
             case OVERWRITE:
-                LOG.info("overwriting {}={} (previous value was {})", key, value, properties.get(key));
+                LOG.debug("overwriting {}={} (previous value was {})", key, value, properties.get(key));
                 properties.put(key, value);
                 break;
             case EXCEPTION:
@@ -172,7 +172,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
                         "Configuration already has a key {}, value of {}%s, value of %s", key, properties.get(key)));
             }
         } else {
-            LOG.info("adding {} = {}", key , safe(key, value));
+            LOG.debug("adding {} = {}", key , safe(key, value));
             properties.put(key, value);
         }
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectSpecIdFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectSpecIdFacetFactory.java
new file mode 100644
index 0000000..52a944e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectSpecIdFacetFactory.java
@@ -0,0 +1,19 @@
+package org.apache.isis.core.metamodel.facets;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+
+public interface ObjectSpecIdFacetFactory extends FacetFactory {
+
+    // //////////////////////////////////////
+    // process objectSpecId
+    // //////////////////////////////////////
+
+    public static class ProcessObjectSpecIdContext extends AbstractProcessWithClsContext<FacetHolder> {
+        public ProcessObjectSpecIdContext(final Class<?> cls, final FacetHolder facetHolder) {
+            super(cls, facetHolder);
+        }
+    }
+
+    void process(final ProcessObjectSpecIdContext processClassContext);
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index 1f71b77..b836e74 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -42,7 +42,6 @@ import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
 import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-
 public class ActionLayoutFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory {
 
     public ActionLayoutFacetFactory() {
@@ -141,7 +140,7 @@ public class ActionLayoutFacetFactory extends FacetFactoryAbstract implements Co
         }
     }
 
-    protected boolean isContributingServiceOrMixinObject(final ProcessMethodContext processMethodContext) {
+    private boolean isContributingServiceOrMixinObject(final ProcessMethodContext processMethodContext) {
         final Class<?> cls =  processMethodContext.getCls();
         final ObjectSpecification spec = getSpecificationLoader().loadSpecification(cls);
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
index bbdfd1a..37f4f69 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
@@ -20,6 +20,7 @@
 package org.apache.isis.core.metamodel.facets.actions.notcontributed.derived;
 
 import java.lang.reflect.Method;
+
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
index ba19a5d..1caab9c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
@@ -20,13 +20,13 @@
 package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived;
 
 import java.lang.reflect.Method;
+
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import org.apache.isis.core.metamodel.progmodel.DeprecatedMarker;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory extends FacetFactoryAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 35808b6..77e6a32 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -54,6 +54,7 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
 import org.apache.isis.core.metamodel.facets.Annotations;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
 import org.apache.isis.core.metamodel.facets.PostConstructMethodCache;
 import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
 import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
@@ -102,7 +103,7 @@ import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapabl
 
 
 public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
-        implements MetaModelValidatorRefiner, PostConstructMethodCache {
+        implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFacetFactory {
 
     private final MetaModelValidatorForDeprecatedAnnotation auditedValidator = new MetaModelValidatorForDeprecatedAnnotation(Audited.class);
     private final MetaModelValidatorForDeprecatedAnnotation publishedObjectValidator = new MetaModelValidatorForDeprecatedAnnotation(PublishedObject.class);
@@ -120,6 +121,11 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
     }
 
     @Override
+    public void process(final ProcessObjectSpecIdContext processClassContext) {
+        processObjectType(processClassContext);
+    }
+
+    @Override
     public void process(final ProcessClassContext processClassContext) {
 
         processAuditing(processClassContext);
@@ -127,7 +133,6 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         processAutoComplete(processClassContext);
         processBounded(processClassContext);
         processEditing(processClassContext);
-        processObjectType(processClassContext);
         processNature(processClassContext);
         processLifecycleEvents(processClassContext);
         processDomainEvents(processClassContext);
@@ -156,7 +161,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         // check for the deprecated annotation first
         final Audited annotation = Annotations.getAnnotation(cls, Audited.class);
         auditableFacet = auditedValidator.flagIfPresent(
-                            AuditableFacetForAuditedAnnotation.create(annotation, holder), null);
+                AuditableFacetForAuditedAnnotation.create(annotation, holder), null);
 
         // else check for @DomainObject(auditing=....)
         if(auditableFacet == null) {
@@ -188,7 +193,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         final PublishedObject publishedObject = Annotations.getAnnotation(processClassContext.getCls(),
                 PublishedObject.class);
         publishedObjectFacet = publishedObjectValidator.flagIfPresent(
-                                    PublishedObjectFacetForPublishedObjectAnnotation.create(publishedObject, facetHolder));
+                PublishedObjectFacetForPublishedObjectAnnotation.create(publishedObject, facetHolder));
 
         // else check from @DomainObject(publishing=...)
         if(publishedObjectFacet == null) {
@@ -234,7 +239,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
             return null;
         }
         return new AutoCompleteFacetForAutoCompleteAnnotation(
-                        facetHolder, repositoryClass, repositoryMethod, servicesInjector);
+                facetHolder, repositoryClass, repositoryMethod, servicesInjector);
     }
 
     private AutoCompleteFacet createFor(
@@ -257,7 +262,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         }
 
         return new AutoCompleteFacetForDomainObjectAnnotation(
-                        facetHolder, repositoryClass, repositoryMethod, servicesInjector);
+                facetHolder, repositoryClass, repositoryMethod, servicesInjector);
     }
 
     private Method findRepositoryMethod(
@@ -288,10 +293,10 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         // check for the deprecated @Bounded annotation first
         final Bounded annotation = Annotations.getAnnotation(processClassContext.getCls(), Bounded.class);
         Facet facet = boundedValidator.flagIfPresent(
-            ChoicesFacetFromBoundedAnnotation.create(annotation, processClassContext.getFacetHolder(),
-                    getDeploymentCategory(),
-                    getAuthenticationSessionProvider(),
-                    persistenceSessionServiceInternal));
+                ChoicesFacetFromBoundedAnnotation.create(annotation, processClassContext.getFacetHolder(),
+                        getDeploymentCategory(),
+                        getAuthenticationSessionProvider(),
+                        persistenceSessionServiceInternal));
 
         // else check from @DomainObject(bounded=...)
         if(facet == null) {
@@ -322,17 +327,17 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         FacetUtil.addFacet(facet);
     }
 
-    void processObjectType(final ProcessClassContext processClassContext) {
-        final Class<?> cls = processClassContext.getCls();
-        final DomainObject domainObject = Annotations.getAnnotation(cls, DomainObject.class);
-        final FacetHolder facetHolder = processClassContext.getFacetHolder();
+    void processObjectType(final ProcessObjectSpecIdContext context) {
+        final Class<?> cls = context.getCls();
+        final FacetHolder facetHolder = context.getFacetHolder();
 
         // check for the deprecated annotation first
-        final ObjectType annotation = Annotations.getAnnotation(processClassContext.getCls(), ObjectType.class);
+        final ObjectType annotation = Annotations.getAnnotation(cls, ObjectType.class);
         Facet facet = objectTypeValidator.flagIfPresent(
-                ObjectSpecIdFacetFromObjectTypeAnnotation.create(annotation, processClassContext.getFacetHolder()));
+                ObjectSpecIdFacetFromObjectTypeAnnotation.create(annotation, facetHolder));
 
         // else check from @DomainObject(objectType=...)
+        final DomainObject domainObject = Annotations.getAnnotation(cls, DomainObject.class);
         if(facet == null) {
             facet = ObjectSpecIdFacetForDomainObjectAnnotation.create(domainObject, facetHolder);
         }
@@ -540,7 +545,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         if(domainEvent != ActionDomainEvent.Default.class) {
             final ActionDomainEventDefaultFacetForDomainObjectAnnotation facet =
                     new ActionDomainEventDefaultFacetForDomainObjectAnnotation(
-                        holder, domainEvent, getSpecificationLoader());
+                            holder, domainEvent, getSpecificationLoader());
             FacetUtil.addFacet(facet);
         }
     }
@@ -551,7 +556,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         if(domainEvent != PropertyDomainEvent.Default.class) {
             final PropertyDomainEventDefaultFacetForDomainObjectAnnotation facet =
                     new PropertyDomainEventDefaultFacetForDomainObjectAnnotation(
-                        holder, domainEvent, getSpecificationLoader());
+                            holder, domainEvent, getSpecificationLoader());
             FacetUtil.addFacet(facet);
         }
     }
@@ -562,7 +567,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
         if(domainEvent != CollectionDomainEvent.Default.class) {
             final CollectionDomainEventDefaultFacetForDomainObjectAnnotation facet =
                     new CollectionDomainEventDefaultFacetForDomainObjectAnnotation(
-                        holder, domainEvent, getSpecificationLoader());
+                            holder, domainEvent, getSpecificationLoader());
             FacetUtil.addFacet(facet);
         }
     }
@@ -606,7 +611,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
                     }
                     validationFailures.add(
                             "%s: cannot have two entities with same object type (@Discriminator, @DomainObject(objectType=...), @ObjectType or @PersistenceCapable(schema=...)); %s " +
-                            "has same value (%s).",
+                                    "has same value (%s).",
                             existingSpec.getFullIdentifier(),
                             otherSpec.getFullIdentifier(),
                             objectSpecId);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
index 9396981..75dce17 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethodFactory.java
@@ -25,12 +25,12 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
+import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.hidden.HiddenObjectFacet;
 import org.apache.isis.core.metamodel.methodutils.MethodScope;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
 
 /**
  * Installs the {@link HiddenObjectFacetViaMethod} on the
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
index 312b8ca..bb38c5c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
 import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
@@ -44,8 +45,9 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorCom
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting;
 import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
 
-public class ObjectSpecIdFacetDerivedFromClassNameFactory extends FacetFactoryAbstract implements
-        MetaModelValidatorRefiner {
+public class ObjectSpecIdFacetDerivedFromClassNameFactory
+        extends FacetFactoryAbstract
+        implements MetaModelValidatorRefiner, ObjectSpecIdFacetFactory {
 
     public static final String ISIS_REFLECTOR_VALIDATOR_EXPLICIT_OBJECT_TYPE_KEY =
             "isis.reflector.validator.explicitObjectType";
@@ -59,20 +61,26 @@ public class ObjectSpecIdFacetDerivedFromClassNameFactory extends FacetFactoryAb
     }
 
     @Override
-    public void process(final ProcessClassContext processClassContaxt) {
-        final FacetHolder facetHolder = processClassContaxt.getFacetHolder();
+    public void process(final ProcessObjectSpecIdContext processClassContext) {
+        final FacetHolder facetHolder = processClassContext.getFacetHolder();
         // don't trash existing facet
         if(facetHolder.containsDoOpFacet(ObjectSpecIdFacet.class)) {
             return;
         }
-        final Class<?> originalClass = processClassContaxt.getCls();
-        final Class<?> substitutedClass = classSubstitutor.getClass(originalClass);
+        final Class<?> cls = processClassContext.getCls();
+        final Class<?> substitutedClass = classSubstitutor.getClass(cls);
 
-        ObjectSpecIdFacet objectSpecIdFacet = createObjectSpecIdFacet(facetHolder, substitutedClass);
+        final ObjectSpecIdFacet objectSpecIdFacet = createObjectSpecIdFacet(facetHolder, substitutedClass);
         FacetUtil.addFacet(objectSpecIdFacet);
     }
 
-    private static ObjectSpecIdFacet createObjectSpecIdFacet(final FacetHolder facetHolder, final Class<?> substitutedClass) {
+    @Override
+    public void process(final ProcessClassContext processClassContext) {
+        // now a no-op.
+    }
+
+    private static ObjectSpecIdFacet createObjectSpecIdFacet(
+            final FacetHolder facetHolder, final Class<?> substitutedClass) {
         final boolean isService = isService(facetHolder);
         if (isService) {
             final String id = ServiceUtil.id(substitutedClass);
@@ -120,8 +128,8 @@ public class ObjectSpecIdFacetDerivedFromClassNameFactory extends FacetFactoryAb
                         }
                         ObjectSpecIdFacet objectSpecIdFacet = objectSpec.getFacet(ObjectSpecIdFacet.class);
                         if(objectSpecIdFacet instanceof ObjectSpecIdFacetDerivedFromClassName &&
-                           // as a special case, don't enforce this for fixture scripts... we never invoke actions on fixture scripts anyway
-                           !FixtureScript.class.isAssignableFrom(objectSpec.getCorrespondingClass()) ) {
+                                // as a special case, don't enforce this for fixture scripts... we never invoke actions on fixture scripts anyway
+                                !FixtureScript.class.isAssignableFrom(objectSpec.getCorrespondingClass()) ) {
 
                             validationFailures.add(
                                     "%s: the object type must be specified explicitly ('%s' config property).  Defaulting the object type from the package/class/package name can lead to data migration issues for apps deployed to production (if the class is subsequently refactored).  Use @Discriminator, @DomainObject(objectType=...) or @PersistenceCapable(schema=...) to specify explicitly.",
@@ -177,4 +185,5 @@ public class ObjectSpecIdFacetDerivedFromClassNameFactory extends FacetFactoryAb
         }
         return false;
     }
+
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
index ba91515..66a50fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
@@ -20,6 +20,7 @@
 package org.apache.isis.core.metamodel.facets.object.recreatable;
 
 import java.lang.reflect.Method;
+
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
index 1d3a4d2..66b372c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
@@ -37,9 +37,9 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 
 public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract extends RecreatableObjectFacetAbstract {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetSimple.java
similarity index 50%
copy from core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetSimple.java
index f942a0a..5b50363 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetSimple.java
@@ -17,28 +17,34 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.specloader;
+package org.apache.isis.core.metamodel.facets.object.value;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+public class ValueFacetSimple extends FacetAbstract implements ValueFacet {
 
-public class SpecificationLoaderTest_value extends SpecificationLoaderTestAbstract {
+    public static Class<? extends Facet> type() {
+        return ValueFacet.class;
+    }
 
-    @Override
-    protected ObjectSpecification loadSpecification(final SpecificationLoader reflector) {
-        return reflector.loadSpecification(String.class);
+    public ValueFacetSimple(final FacetHolder holder) {
+        super(type(), holder, Derivation.NOT_DERIVED);
     }
 
-    @Test
-    public void testType() throws Exception {
-        Assert.assertTrue(specification.isNotCollection());
+    @Override
+    public Class<? extends Facet>[] facetTypes() {
+        return new Class[]{ValueFacet.class};
     }
 
-    @Test
-    public void testName() throws Exception {
-        Assert.assertEquals(String.class.getName(), specification.getFullIdentifier());
+    @Override
+    public <T extends Facet> T getFacet(final Class<T> facet) {
+        return (T)this;
     }
 
+    @Override
+    public boolean containsFacetTypeOf(final Class<? extends Facet> facetType) {
+        return facetType == ValueFacet.class;
+    }
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
index 58148a3..615764f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
@@ -34,12 +34,12 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.CollectionUtils;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.facets.param.choices.ActionChoicesFacetAbstract;
 import org.apache.isis.core.metamodel.spec.DomainModelException;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.facets.CollectionUtils;
 
 public class ActionChoicesFacetViaMethod extends ActionChoicesFacetAbstract implements ImperativeFacet {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
index 01548f6..0cf2547 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
@@ -66,11 +66,11 @@ public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract
         }
     }
 
-    private boolean addMaskFacetAndCorrespondingTitleFacet(final Mask annotation, final Class<?> cls, final AbstractProcessWithMethodContext processContext) {
+    private void addMaskFacetAndCorrespondingTitleFacet(final Mask annotation, final Class<?> cls, final AbstractProcessWithMethodContext processContext) {
         final FacetHolder holder = processContext.getFacetHolder();
         final MaskFacet maskFacet = validator.flagIfPresent(createMaskFacet(annotation, holder), processContext);
         if (maskFacet == null) {
-            return false;
+            return;
         }
         FacetUtil.addFacet(maskFacet);
 
@@ -80,7 +80,6 @@ public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract
             final TitleFacet titleFacet = new TitleFacetBasedOnMask(maskFacet, underlyingTitleFacet);
             FacetUtil.addFacet(titleFacet);
         }
-        return true;
     }
 
     private MaskFacet createMaskFacet(final Mask annotation, final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
index 8b0ca19..5e26d88 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
@@ -24,9 +24,9 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
+import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacetAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacetAbstract;
 
 public class PropertyChoicesFacetDerivedFromChoicesFacet extends PropertyChoicesFacetAbstract {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
index 9e4d614..7e1344d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
@@ -89,11 +89,11 @@ public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract i
         return annotation != null ? new MaskFacetOnPropertyAnnotation(annotation.value(), null, holder) : null;
     }
 
-    private boolean addMaskFacetAndCorrespondingTitleFacet(final Mask annotation, final Class<?> cls, final AbstractProcessWithMethodContext processContext) {
+    private void addMaskFacetAndCorrespondingTitleFacet(final Mask annotation, final Class<?> cls, final AbstractProcessWithMethodContext processContext) {
         final FacetHolder facetHolder = processContext.getFacetHolder();
         final MaskFacet maskFacet = validator.flagIfPresent(createMaskFacet(annotation, facetHolder), processContext);
         if (maskFacet == null) {
-            return false;
+            return;
         }
         FacetUtil.addFacet(maskFacet);
 
@@ -103,7 +103,6 @@ public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract i
             final TitleFacet titleFacet = new TitleFacetBasedOnMask(maskFacet, underlyingTitleFacet);
             FacetUtil.addFacet(titleFacet);
         }
-        return true;
     }
 
     @Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timejodalocal/JodaLocalTimeValueFacetSimpleFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timejodalocal/JodaLocalTimeValueFacetSimpleFactory.java
new file mode 100644
index 0000000..31ce6e3
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timejodalocal/JodaLocalTimeValueFacetSimpleFactory.java
@@ -0,0 +1,47 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.value.timejodalocal;
+
+import org.joda.time.LocalDate;
+import org.joda.time.LocalTime;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacetSimple;
+import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory;
+
+public class JodaLocalTimeValueFacetSimpleFactory extends ValueFacetUsingSemanticsProviderFactory<LocalDate> {
+
+    public JodaLocalTimeValueFacetSimpleFactory() {
+        super();
+    }
+
+    @Override
+    public void process(final ProcessClassContext processClassContext) {
+        final Class<?> type = processClassContext.getCls();
+        final FacetHolder holder = processClassContext.getFacetHolder();
+
+        if (type != LocalTime.class) {
+            return;
+        }
+        FacetUtil.addFacet(new ValueFacetSimple(holder));
+    }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
index 8c390b2..10981aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
@@ -358,9 +358,7 @@ public class DeriveFacetsPostProcessor implements ObjectSpecificationPostProcess
         }
         final ObjectSpecification returnSpec = objectAction.getReturnType();
         final DescribedAsFacet specFacet = returnSpec.getFacet(DescribedAsFacet.class);
-        //TODO: this ought to check if a do-op; if you come across this, you can probably change it (just taking smaller steps for now)
-        //if(existsAndIsDoOp(specFacet)) {
-        if(specFacet != null) {
+        if(existsAndIsDoOp(specFacet)) {
             FacetUtil.addFacet(new DescribedAsFacetOnMemberDerivedFromType(specFacet, facetedMethodFor(objectAction)));
         }
     }
@@ -494,9 +492,7 @@ public class DeriveFacetsPostProcessor implements ObjectSpecificationPostProcess
         }
         final ObjectSpecification returnSpec = objectAssociation.getSpecification();
         final DescribedAsFacet specFacet = returnSpec.getFacet(DescribedAsFacet.class);
-        //TODO: this ought to check if a do-op; if you come across this, you can probably change it (just taking smaller steps for now)
-        //if(existsAndIsDoOp(specFacet)) {
-        if(specFacet != null) {
+        if(existsAndIsDoOp(specFacet)) {
             FacetUtil.addFacet(
                     new DescribedAsFacetOnMemberDerivedFromType(specFacet, facetedMethodFor(objectAssociation)));
         }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
index 27736d4..48d0eac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
@@ -115,8 +115,15 @@ class MetaModelExporter {
 
         // phase 2: now flesh out the domain class types, passing the map for lookups of the domainClassTypes that
         // correspond to each object members types.
-        for (final ObjectSpecification specification : Lists.newArrayList(domainClassByObjectSpec.keySet())) {
-            addFacetsAndMembersTo(specification, domainClassByObjectSpec, config);
+        final List<ObjectSpecification> processed = Lists.newArrayList();
+        List<ObjectSpecification> toProcess =
+                remaining(domainClassByObjectSpec.keySet(), processed);
+        while(!toProcess.isEmpty()) {
+            for (final ObjectSpecification specification : toProcess) {
+                addFacetsAndMembersTo(specification, domainClassByObjectSpec, config);
+            }
+            processed.addAll(toProcess);
+            toProcess = remaining(domainClassByObjectSpec.keySet(), processed);
         }
 
         // phase 2.5: check no duplicates
@@ -149,6 +156,12 @@ class MetaModelExporter {
         return metamodelDto;
     }
 
+    private static <T> List<T> remaining(final java.util.Collection<T> processed, final java.util.Collection<T> other) {
+        final List<T> x = Lists.newArrayList(processed);
+        x.removeAll(other);
+        return x;
+    }
+
     private boolean notInPackagePrefixes(
             final ObjectSpecification specification, final MetaModelService6.Config config) {
         return !inPackagePrefixes(specification, config);
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 ab1894c..c194998 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
@@ -99,11 +99,7 @@ public class MetaModelServiceDefault implements MetaModelService6 {
     public void rebuild(final Class<?> domainType) {
         specificationLookup.invalidateCache(domainType);
         gridService.remove(domainType);
-        final ObjectSpecification objectSpecification = specificationLookup.loadSpecification(domainType);
-        // ensure the spec is fully rebuilt
-        objectSpecification.getObjectActions(Contributed.INCLUDED);
-        objectSpecification.getAssociations(Contributed.INCLUDED);
-        specificationLookup.postProcess(objectSpecification);
+        specificationLookup.loadSpecification(domainType);
     }
 
     // //////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java
index 5447214..a6a18f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java
@@ -21,8 +21,10 @@ package org.apache.isis.core.metamodel.specloader;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
@@ -41,7 +43,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
  *
  */
 class SpecificationCacheDefault {
-    
+
     private final Map<String, ObjectSpecification> specByClassName = Maps.newHashMap();
     private Map<ObjectSpecId, String> classNameBySpecId;
 
@@ -53,7 +55,7 @@ class SpecificationCacheDefault {
         specByClassName.put(className, spec);
         recache(spec);
     }
-    
+
 
     public void clear() {
         specByClassName.clear();
@@ -63,7 +65,7 @@ class SpecificationCacheDefault {
         return Collections.unmodifiableCollection(specByClassName.values());
     }
 
-    public ObjectSpecification getByObjectType(ObjectSpecId objectSpecID) {
+    public ObjectSpecification getByObjectType(final ObjectSpecId objectSpecID) {
         if (!isInitialized()) {
             throw new IllegalStateException("SpecificationCache by object type has not yet been initialized");
         }
@@ -72,14 +74,23 @@ class SpecificationCacheDefault {
     }
 
     synchronized void init() {
-        final Collection<ObjectSpecification> objectSpecifications = allSpecifications();
         final Map<ObjectSpecId, ObjectSpecification> specById = Maps.newHashMap();
-        for (final ObjectSpecification objSpec : objectSpecifications) {
-            final ObjectSpecId objectSpecId = objSpec.getSpecId();
-            if (objectSpecId == null) {
-                continue;
+
+        final List<ObjectSpecification> cachedSpecifications = Lists.newArrayList();
+        while(true) {
+            final Collection<ObjectSpecification> newSpecifications = Lists.newArrayList(allSpecifications());
+            newSpecifications.removeAll(cachedSpecifications);
+            if(newSpecifications.isEmpty()) {
+                break;
             }
-            specById.put(objectSpecId, objSpec);
+            for (final ObjectSpecification objSpec : newSpecifications) {
+                final ObjectSpecId objectSpecId = objSpec.getSpecId();
+                if (objectSpecId == null) {
+                    continue;
+                }
+                specById.put(objectSpecId, objSpec);
+            }
+            cachedSpecifications.addAll(newSpecifications);
         }
 
         internalInit(specById);
@@ -126,7 +137,7 @@ class SpecificationCacheDefault {
         }
         classNameBySpecId.put(spec.getSpecId(), spec.getCorrespondingClass().getName());
     }
-    
+
     boolean isInitialized() {
         return classNameBySpecId != null;
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index fefa1ab..3e66ce5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -36,13 +36,12 @@ import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.commons.config.ConfigPropertyBoolean;
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ClassUtil;
 import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
@@ -55,6 +54,7 @@ import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitut
 import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
 import org.apache.isis.core.metamodel.specloader.postprocessor.PostProcessor;
 import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilderContext;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
 import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
 import org.apache.isis.core.metamodel.specloader.specimpl.standalonelist.ObjectSpecificationOnStandaloneList;
@@ -91,8 +91,12 @@ public class SpecificationLoader implements ApplicationScopedComponent {
 
     private final static Logger LOG = LoggerFactory.getLogger(SpecificationLoader.class);
 
-    public static final String INTROSPECTOR_PARALLELIZE_KEY = "isis.reflector.introspector.parallelize";
-    public static final boolean INTROSPECTOR_PARALLELIZE_DEFAULT = true;
+    public static final ConfigPropertyBoolean CONFIG_PROPERTY_PARALLELIZE =
+            new ConfigPropertyBoolean("isis.reflector.introspector.parallelize", true);
+
+    public static final ConfigPropertyBoolean CONFIG_PROPERTY_FULL_INTROSPECTION =
+            new ConfigPropertyBoolean("isis.reflector.introspector.fullIntrospection", false);
+
 
     //region > constructor, fields
     private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
@@ -108,11 +112,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
     private final List<LayoutMetadataReader> layoutMetadataReaders;
     private final PostProcessor postProcessor;
 
-    enum State {
-        NOT_INITIALIZED,
-        CACHING,
-        INTROSPECTING
-    }
 
 
     public SpecificationLoader(
@@ -132,15 +131,8 @@ public class SpecificationLoader implements ApplicationScopedComponent {
         this.postProcessor = new PostProcessor(programmingModel, servicesInjector);
 
         this.layoutMetadataReaders = layoutMetadataReaders;
-
-        this.state = State.NOT_INITIALIZED;
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        LOG.info("finalizing reflector factory", this);
-    }
 
 
     //endregion
@@ -148,8 +140,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
 
     //region > internalInit
 
-    private State state;
-
     /**
      * Initializes and wires up, and primes the cache based on any service
      * classes (provided by the {@link ServicesInjector}).
@@ -175,36 +165,74 @@ public class SpecificationLoader implements ApplicationScopedComponent {
         metaModelValidator.init(this);
 
 
-        state = State.CACHING;
-
         // need to completely load services and mixins (synchronously)
+        LOG.info("Loading all specs (up to state of {})", IntrospectionState.NOT_INTROSPECTED);
+
         final List<ObjectSpecification> specificationsFromRegistry = Lists.newArrayList();
 
-        loadSpecificationsFor(
-                CommonDtoUtils.VALUE_TYPES, null,
-                IntrospectionStrategy.STUB, specificationsFromRegistry);
+        // we use allServiceClasses() - obtained from servicesInjector - rather than reading from the
+        // AppManifest.Registry.instance().getDomainServiceTypes(), because the former also has the fallback
+        // services set up in IsisSessionFactoryBuilder beforehand.
+        final List<ObjectSpecification> domainServiceSpecs =
         loadSpecificationsFor(
                 allServiceClasses(), NatureOfService.DOMAIN,
-                IntrospectionStrategy.STUB, specificationsFromRegistry);
-        loadSpecificationsFor(
+                specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
+        );
+        final List<ObjectSpecification> mixinSpecs =
+            loadSpecificationsFor(
                 AppManifest.Registry.instance().getMixinTypes(), null,
-                IntrospectionStrategy.STUB, specificationsFromRegistry);
+                specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
+        );
+        loadSpecificationsFor(
+                CommonDtoUtils.VALUE_TYPES, null,
+                specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
+        );
         loadSpecificationsFor(
                 AppManifest.Registry.instance().getDomainObjectTypes(), null,
-                IntrospectionStrategy.STUB, specificationsFromRegistry);
+                specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
+        );
         loadSpecificationsFor(
                 AppManifest.Registry.instance().getViewModelTypes(), null,
-                IntrospectionStrategy.STUB, specificationsFromRegistry);
+                specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
+        );
         loadSpecificationsFor(
                 AppManifest.Registry.instance().getXmlElementTypes(), null,
-                IntrospectionStrategy.STUB, specificationsFromRegistry);
+                specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
+        );
+
+        cache.init();
 
-        state = State.INTROSPECTING;
         final Collection<ObjectSpecification> cachedSpecifications = allCachedSpecifications();
 
+        logBefore(specificationsFromRegistry, cachedSpecifications);
+
+        LOG.info("Introspecting all specs up to {}", IntrospectionState.TYPE_INTROSPECTED);
+        introspect(specificationsFromRegistry, IntrospectionState.TYPE_INTROSPECTED);
 
-        // for debugging only
-        LOG.info(String.format(
+        LOG.info("Introspecting domainService specs up to {}", IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+        introspect(domainServiceSpecs, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
+        LOG.info("Introspecting mixin specs up to {}", IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+        introspect(mixinSpecs, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
+        logAfter(cachedSpecifications);
+
+        final boolean validate = CONFIG_PROPERTY_FULL_INTROSPECTION.from(configuration);
+        if(validate) {
+            LOG.info("Introspecting all cached specs up to {}", IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+            introspect(cachedSpecifications, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+        }
+
+        LOG.info("init() - done");
+    }
+
+    private void logBefore(
+            final List<ObjectSpecification> specificationsFromRegistry,
+            final Collection<ObjectSpecification> cachedSpecifications) {
+        if(!LOG.isDebugEnabled()) {
+            return;
+        }
+        LOG.debug(String.format(
                 "specificationsFromRegistry.size = %d ; cachedSpecifications.size = %d",
                 specificationsFromRegistry.size(), cachedSpecifications.size()));
 
@@ -223,74 +251,80 @@ public class SpecificationLoader implements ApplicationScopedComponent {
                     }
                 }).toList();
 
-        LOG.info(String.format(
+        LOG.debug(String.format(
                 "registryNotCached.size = %d ; cachedNotRegistry.size = %d",
                 registryNotCached.size(), cachedNotRegistry.size()));
+    }
 
+    private void logAfter(final Collection<ObjectSpecification> cachedSpecifications) {
+        if(!LOG.isDebugEnabled()) {
+            return;
+        }
+
+        final Collection<ObjectSpecification> cachedSpecificationsAfter = cache.allSpecifications();
+        ImmutableList<ObjectSpecification> cachedAfterNotBefore = FluentIterable.from(cachedSpecificationsAfter)
+                .filter(new Predicate<ObjectSpecification>() {
+                    @Override
+                    public boolean apply(final ObjectSpecification objectSpecification) {
+                        return !cachedSpecifications.contains(objectSpecification);
+                    }
+                }).toList();
+        LOG.debug(String.format("cachedSpecificationsAfter.size = %d ; cachedAfterNotBefore.size = %d",
+                cachedSpecificationsAfter.size(), cachedAfterNotBefore.size()));
+    }
 
+    private void introspect(final Collection<ObjectSpecification> specs, final IntrospectionState upTo) {
         final List<Callable<Object>> callables = Lists.newArrayList();
-        for (final ObjectSpecification specification : specificationsFromRegistry) {
+        for (final ObjectSpecification specification : specs) {
             Callable<Object> callable = new Callable<Object>() {
                 @Override
                 public Object call() {
-                    introspectIfRequired(specification);
+
+                    final ObjectSpecificationAbstract specSpi = (ObjectSpecificationAbstract) specification;
+                    specSpi.introspectUpTo(upTo);
+
                     return null;
                 }
                 public String toString() {
                     return String.format(
-                            "introspectIfRequired(\"%s\")",
-                            specification.getFullIdentifier());
+                            "%s: #introspectUpTo( %s )",
+                            specification.getFullIdentifier(), upTo);
                 }
             };
             callables.add(callable);
         }
-        ThreadPoolSupport threadPoolSupport = ThreadPoolSupport.getInstance();
-        final boolean parallelize =
-                configuration.getBoolean(INTROSPECTOR_PARALLELIZE_KEY, INTROSPECTOR_PARALLELIZE_DEFAULT);
-        List<Future<Object>> futures;
-        if(parallelize) {
-            futures = threadPoolSupport.invokeAll(callables);
-        } else {
-            futures = threadPoolSupport.invokeAllSequential(callables);
-        }
-        threadPoolSupport.joinGatherFailures(futures);
-
-
-        // for debugging only
-        final Collection<ObjectSpecification> cachedSpecificationsAfter = cache.allSpecifications();
-        ImmutableList<ObjectSpecification> cachedAfterNotBefore = FluentIterable.from(cachedSpecificationsAfter)
-                .filter(new Predicate<ObjectSpecification>() {
-                    @Override
-                    public boolean apply(final ObjectSpecification objectSpecification) {
-                        return !cachedSpecifications.contains(objectSpecification);
-                    }
-                }).toList();
-        LOG.info(String.format("cachedSpecificationsAfter.size = %d ; cachedAfterNotBefore.size = %d",
-                cachedSpecificationsAfter.size(), cachedAfterNotBefore.size()));
-
+        invokeAndWait(callables);
+    }
 
-        // only after full introspection has occurred do we cache ObjectSpecifications
-        // by their ObjectSpecId.
-        // the cache (SpecificationCacheDefault will fail-fast as not initialized
-        cache.init();
+    private void invokeAndWait(final List<Callable<Object>> callables) {
+        final ThreadPoolSupport threadPoolSupport = ThreadPoolSupport.getInstance();
+        final boolean parallelize = CONFIG_PROPERTY_PARALLELIZE.from(configuration);
 
+        final List<Future<Object>> futures = parallelize
+                ? threadPoolSupport.invokeAll(callables)
+                : threadPoolSupport.invokeAllSequential(callables);
+        threadPoolSupport.joinGatherFailures(futures);
     }
 
-    private void loadSpecificationsFor(
+    private List<ObjectSpecification> loadSpecificationsFor(
             final Collection<Class<?>> domainTypes,
             final NatureOfService natureOfServiceFallback,
-            final IntrospectionStrategy introspectionStrategy,
-            final List<ObjectSpecification> appendTo) {
+            final List<ObjectSpecification> appendTo,
+            final IntrospectionState upTo) {
 
+        final List<ObjectSpecification> specs = Lists.newArrayList();
         for (final Class<?> domainType : domainTypes) {
 
             ObjectSpecification objectSpecification =
-                internalLoadSpecification(domainType, natureOfServiceFallback, introspectionStrategy);
+                internalLoadSpecification(domainType, natureOfServiceFallback, upTo);
 
             if(objectSpecification != null) {
-                appendTo.add(objectSpecification);
+                specs.add(objectSpecification);
             }
         }
+        appendTo.addAll(specs);
+
+        return specs;
     }
 
 
@@ -304,8 +338,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
     public void shutdown() {
         LOG.info("shutting down {}", this);
 
-        state = State.NOT_INITIALIZED;
-
         cache.clear();
     }
 
@@ -328,7 +360,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
             return;
         }
 
-        ObjectSpecification spec = loadSpecification(substitutedType);
+        ObjectSpecification spec = loadSpecification(substitutedType, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
         while(spec != null) {
             final Class<?> type = spec.getCorrespondingClass();
             cache.remove(type.getName());
@@ -353,10 +385,14 @@ public class SpecificationLoader implements ApplicationScopedComponent {
 
     @Programmatic
     public void validateAndAssert() {
+        final Boolean validate = CONFIG_PROPERTY_FULL_INTROSPECTION.from(configuration);
+        if(!validate) {
+            LOG.info("Meta model validation skipped (full introspection of metamodel not configured)");
+            return;
+        }
+
         ValidationFailures validationFailures = validate();
         validationFailures.assertNone();
-
-        cache.init();
     }
 
     @Programmatic
@@ -383,11 +419,16 @@ public class SpecificationLoader implements ApplicationScopedComponent {
      */
     @Programmatic
     public ObjectSpecification loadSpecification(final String className) {
+        return loadSpecification(className, IntrospectionState.TYPE_INTROSPECTED);
+    }
+
+    @Programmatic
+    public ObjectSpecification loadSpecification(final String className, final IntrospectionState upTo) {
         assert className != null;
 
         try {
             final Class<?> cls = loadBuiltIn(className);
-            return internalLoadSpecification(cls);
+            return internalLoadSpecification(cls, null, upTo);
         } catch (final ClassNotFoundException e) {
             final ObjectSpecification spec = cache.get(className);
             if (spec == null) {
@@ -397,12 +438,14 @@ public class SpecificationLoader implements ApplicationScopedComponent {
         }
     }
 
-    /**
-     * @see #loadSpecification(String)
-     */
     @Programmatic
     public ObjectSpecification loadSpecification(final Class<?> type) {
-        final ObjectSpecification spec = internalLoadSpecification(type);
+        return loadSpecification(type, IntrospectionState.TYPE_INTROSPECTED);
+    }
+
+    @Programmatic
+    public ObjectSpecification loadSpecification(final Class<?> type, final IntrospectionState upTo) {
+        final ObjectSpecification spec = internalLoadSpecification(type, null, upTo);
         if(spec == null) {
             return null;
         }
@@ -419,71 +462,41 @@ public class SpecificationLoader implements ApplicationScopedComponent {
         return spec;
     }
 
-    enum IntrospectionStrategy {
-        /**
-         * Used in a first pass to create ObjectSpecifications that haven't been introspected,
-         * but are cached.
-         */
-        STUB,
-        /**
-         * Second phase (default), to fully introspect.
-         */
-        COMPLETE
-    }
-    private ObjectSpecification internalLoadSpecification(final Class<?> type) {
-        return internalLoadSpecification(type, null, IntrospectionStrategy.COMPLETE);
-    }
-
     private ObjectSpecification internalLoadSpecification(
             final Class<?> type,
             final NatureOfService natureFallback,
-            final IntrospectionStrategy introspectionStrategy) {
+            final IntrospectionState upTo) {
 
         final Class<?> substitutedType = classSubstitutor.getClass(type);
-        return substitutedType != null
-                ? loadSpecificationForSubstitutedClass(substitutedType, natureFallback, introspectionStrategy)
-                : null;
-    }
-
-    private ObjectSpecification loadSpecificationForSubstitutedClass(
-            final Class<?> type,
-            final NatureOfService natureFallback,
-            final IntrospectionStrategy introspectionStrategy) {
-        Assert.assertNotNull(type);
+        if (substitutedType == null) {
+            return null;
+        }
+        Assert.assertNotNull(substitutedType);
 
-        final String typeName = type.getName();
-        final ObjectSpecification spec = cache.get(typeName);
+        final String typeName = substitutedType.getName();
+        ObjectSpecification spec = cache.get(typeName);
         if (spec != null) {
             return spec;
         }
 
-        return loadSpecificationForSubstitutedClassSynchronized(type, natureFallback, introspectionStrategy);
-    }
-
-
-    private synchronized ObjectSpecification loadSpecificationForSubstitutedClassSynchronized(
-            final Class<?> type,
-            final NatureOfService natureOfServiceFallback,
-            final IntrospectionStrategy introspectionStrategy) {
+        synchronized (this) {
+            // inside the synchronized block
+            spec = cache.get(typeName);
+            if (spec != null) {
+                return spec;
+            }
 
-        final String typeName = type.getName();
-        final ObjectSpecification spec = cache.get(typeName);
-        if (spec != null) {
-            // because caller isn't synchronized.
-            return spec;
-        }
+            final ObjectSpecification specification = createSpecification(substitutedType, natureFallback);
 
-        final ObjectSpecification specification = createSpecification(type, natureOfServiceFallback);
+            // put into the cache prior to introspecting, to prevent
+            // infinite loops
+            cache.cache(typeName, specification);
 
-        // put into the cache prior to introspecting, to prevent
-        // infinite loops
-        cache.cache(typeName, specification);
+            final ObjectSpecificationAbstract specSpi = (ObjectSpecificationAbstract) specification;
+            specSpi.introspectUpTo(upTo);
 
-        if(introspectionStrategy == IntrospectionStrategy.COMPLETE) {
-            introspectIfRequired(specification);
+            return specification;
         }
-
-        return specification;
     }
 
     /**
@@ -491,12 +504,16 @@ public class SpecificationLoader implements ApplicationScopedComponent {
      * (to prevent an infinite loop).
      */
     @Programmatic
-    public boolean loadSpecifications(final List<Class<?>> typesToLoad, final Class<?> typeToIgnore) {
+    public boolean loadSpecifications(
+            final List<Class<?>> typesToLoad,
+            final Class<?> typeToIgnore,
+            final IntrospectionState upTo) {
         boolean anyLoadedAsNull = false;
         for (final Class<?> typeToLoad : typesToLoad) {
             if (typeToLoad != typeToIgnore) {
-                final ObjectSpecification noSpec = internalLoadSpecification(typeToLoad);
-                final boolean loadedAsNull = (noSpec == null);
+                final ObjectSpecification objectSpecification =
+                        internalLoadSpecification(typeToLoad, null, upTo);
+                final boolean loadedAsNull = (objectSpecification == null);
                 anyLoadedAsNull = loadedAsNull || anyLoadedAsNull;
             }
         }
@@ -504,14 +521,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
     }
 
     /**
-     * Loads the specifications of the specified types.
-     */
-    @Programmatic
-    public boolean loadSpecifications(final List<Class<?>> typesToLoad) {
-        return loadSpecifications(typesToLoad, null);
-    }
-
-    /**
      * Creates the appropriate type of {@link ObjectSpecification}.
      */
     private ObjectSpecification createSpecification(
@@ -519,20 +528,27 @@ public class SpecificationLoader implements ApplicationScopedComponent {
             final NatureOfService fallback) {
 
         // ... and create the specs
+        final ObjectSpecificationAbstract objectSpec;
         if (FreeStandingList.class.isAssignableFrom(cls)) {
-            return new ObjectSpecificationOnStandaloneList(servicesInjector, facetProcessor);
+
+            objectSpec = new ObjectSpecificationOnStandaloneList(servicesInjector, facetProcessor, postProcessor);
+
         } else {
-            final ConfigurationServiceInternal configService = servicesInjector.lookupService(
-                    ConfigurationServiceInternal.class);
+            final ConfigurationServiceInternal configService =
+                    servicesInjector.lookupService(ConfigurationServiceInternal.class);
+
             final FacetedMethodsBuilderContext facetedMethodsBuilderContext =
                     new FacetedMethodsBuilderContext(
                             this, facetProcessor, layoutMetadataReaders, configService);
 
             final NatureOfService natureOfServiceIfAny = natureOfServiceFrom(cls, fallback);
 
-            return new ObjectSpecificationDefault(cls, facetedMethodsBuilderContext,
-                    servicesInjector, facetProcessor, natureOfServiceIfAny);
+            objectSpec = new ObjectSpecificationDefault(cls,
+                                    facetedMethodsBuilderContext,
+                                    servicesInjector, facetProcessor, natureOfServiceIfAny, postProcessor);
         }
+
+        return objectSpec;
     }
 
     private NatureOfService natureOfServiceFrom(
@@ -550,59 +566,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
         return Class.forName(className);
     }
 
-    /**
-     * Typically does not need to be called, but is available for {@link FacetFactory}s to force
-     * early introspection of referenced specs in certain circumstances.
-     *
-     * <p>
-     * Originally introduced to support {@link AutoCompleteFacet}.
-     */
-    private ObjectSpecification introspectIfRequired(final ObjectSpecification spec) {
-
-        if(state != State.INTROSPECTING) {
-            return spec;
-        }
-
-        final ObjectSpecificationAbstract specSpi = (ObjectSpecificationAbstract)spec;
-        final ObjectSpecificationAbstract.IntrospectionState introspectionState = specSpi.getIntrospectionState();
-
-        // REVIEW: can't remember why this is done in multiple passes, could it be simplified?
-        switch (introspectionState) {
-        case NOT_INTROSPECTED:
-
-            specSpi.setIntrospectionState(ObjectSpecificationAbstract.IntrospectionState.BEING_INTROSPECTED);
-            introspect(specSpi);
-            break;
-        case BEING_INTROSPECTED:
-            introspect(specSpi);
-            break;
-        case INTROSPECTED:
-            // nothing to do
-            break;
-        }
-        return spec;
-    }
-
-    private void introspect(final ObjectSpecificationAbstract specSpi) {
-        specSpi.introspectTypeHierarchyAndMembers();
-        specSpi.updateFromFacetValues();
-        specSpi.setIntrospectionState(ObjectSpecificationAbstract.IntrospectionState.INTROSPECTED);
-    }
-
-    @Programmatic
-    public void postProcess() {
-
-        final Collection<ObjectSpecification> specs = allSpecifications();
-        for (final ObjectSpecification spec : specs) {
-            postProcess(spec);
-        }
-
-    }
-
-    @Programmatic
-    public void postProcess(final ObjectSpecification spec) {
-        postProcessor.postProcess(spec);
-    }
 
     //endregion
 
@@ -676,7 +639,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
         final ObjectSpecification objectSpecification = cache.getByObjectType(objectSpecId);
         if(objectSpecification == null) {
             // fallback
-            return loadSpecification(objectSpecId.asString());
+            return loadSpecification(objectSpecId.asString(), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
         }
         return objectSpecification;
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java
index df2ac9a..a42e1d4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java
@@ -50,8 +50,8 @@ public class ClassSubstitutor {
     //region > getClass(Class)
 
     public Class<?> getClass(final Class<?> cls) {
-    	
-    	if (cls == null) {
+
+        if (cls == null) {
             return null;
         }
 
@@ -92,16 +92,16 @@ public class ClassSubstitutor {
      * For any classes registered as ignored, {@link #getClass(Class)} will
      * return <tt>null</tt>.
      */
-    private boolean ignore(final Class<?> q) {
-        return classesToIgnore.add(q);
+    private void ignore(final Class<?> q) {
+        classesToIgnore.add(q);
     }
 
     /**
      * For any classes registered as ignored, {@link #getClass(Class)} will
      * return <tt>null</tt>.
      */
-    private boolean ignore(final String className) {
-        return classNamesToIgnore.add(className);
+    private void ignore(final String className) {
+        classNamesToIgnore.add(className);
     }
 
     private boolean shouldIgnore(final Class<?> cls) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
index b17918f..69447ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
@@ -43,8 +43,9 @@ import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
 import org.apache.isis.core.metamodel.facets.MethodFilteringFacetFactory;
 import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactory;
 import org.apache.isis.core.metamodel.facets.MethodRemoverConstants;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
 import org.apache.isis.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
-import org.apache.isis.core.metamodel.progmodel.ObjectSpecificationPostProcessor;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.services.ServicesInjectorAware;
@@ -243,6 +244,29 @@ public class FacetProcessor implements ServicesInjectorAware {
         return false;
     }
 
+    public void processObjectSpecId(final Class<?> cls, final FacetHolder facetHolder) {
+        final List<ObjectSpecIdFacetFactory> factoryList = getObjectSpecIfFacetFactoryList();
+        for (final ObjectSpecIdFacetFactory facetFactory : factoryList) {
+            facetFactory.process(new ProcessObjectSpecIdContext(cls, facetHolder));
+        }
+    }
+
+    private List<ObjectSpecIdFacetFactory> objectSpecIfFacetFactoryList = null;
+    private List<ObjectSpecIdFacetFactory> getObjectSpecIfFacetFactoryList() {
+        if(objectSpecIfFacetFactoryList == null) {
+            List<ObjectSpecIdFacetFactory> facetFactories = Lists.newArrayList();
+            final List<FacetFactory> factoryList = getFactoryListByFeatureType(FeatureType.OBJECT);
+            for (final FacetFactory facetFactory : factoryList) {
+                if (facetFactory instanceof ObjectSpecIdFacetFactory) {
+                    final ObjectSpecIdFacetFactory objectSpecIdFacetFactory = (ObjectSpecIdFacetFactory) facetFactory;
+                    facetFactories.add(objectSpecIdFacetFactory);
+                }
+            }
+            objectSpecIfFacetFactoryList = Collections.unmodifiableList(facetFactories);
+        }
+        return objectSpecIfFacetFactoryList;
+    }
+
     /**
      * Attaches all facets applicable to the provided {@link FeatureType#OBJECT
      * object}) to the supplied {@link FacetHolder}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index a76e312..c2dbbb0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -205,6 +205,12 @@ public class FacetedMethodsBuilder {
     // ////////////////////////////////////////////////////////////////////////////
 
 
+    public void introspectObjectSpecId() {
+        if (LOG.isInfoEnabled()) {
+            LOG.info("introspecting {}: objectSpecId", getClassName());
+        }
+        getFacetProcessor().processObjectSpecId(introspectedClass, spec);
+    }
     public Properties introspectClass() {
         if (LOG.isInfoEnabled()) {
             LOG.info("introspecting {}: class-level details", getClassName());
@@ -273,7 +279,7 @@ public class FacetedMethodsBuilder {
                     }
 
                     if(!support.services() &&
-                       getSpecificationLoader().isServiceClass(domainClass)) {
+                            getSpecificationLoader().isServiceClass(domainClass)) {
                         continue;
                     }
 
@@ -324,7 +330,8 @@ public class FacetedMethodsBuilder {
         for (final Method method : associationCandidateMethods) {
             specificationTraverser.traverseTypes(method, typesToLoad);
         }
-        getSpecificationLoader().loadSpecifications(typesToLoad, introspectedClass);
+        getSpecificationLoader().loadSpecifications(typesToLoad, introspectedClass,
+                IntrospectionState.TYPE_INTROSPECTED);
 
         // now create FacetedMethods for collections and for properties
         final List<FacetedMethod> associationFacetedMethods = Lists.newArrayList();
@@ -429,12 +436,12 @@ public class FacetedMethodsBuilder {
 
     /**
      * REVIEW: I'm not sure why we do two passes here.
-     * 
+     *
      * <p>
      * Perhaps it's important to skip helpers first. I doubt it, though.
      */
     private List<FacetedMethod> findActionFacetedMethods(
-            final MethodScope methodScope, 
+            final MethodScope methodScope,
             final Properties metadataProperties) {
         if (LOG.isDebugEnabled()) {
             LOG.debug("introspecting {}: actions", getClassName());
@@ -445,10 +452,10 @@ public class FacetedMethodsBuilder {
     }
 
     private List<FacetedMethod> findActionFacetedMethods(
-            final MethodScope methodScope, 
-            final RecognisedHelpersStrategy recognisedHelpersStrategy, 
+            final MethodScope methodScope,
+            final RecognisedHelpersStrategy recognisedHelpersStrategy,
             final Properties metadataProperties) {
-        
+
         if (LOG.isDebugEnabled()) {
             LOG.debug("  looking for action methods");
         }
@@ -471,9 +478,9 @@ public class FacetedMethodsBuilder {
     }
 
     private FacetedMethod findActionFacetedMethod(
-            final MethodScope methodScope, 
-            final RecognisedHelpersStrategy recognisedHelpersStrategy, 
-            final Method actionMethod, 
+            final MethodScope methodScope,
+            final RecognisedHelpersStrategy recognisedHelpersStrategy,
+            final Method actionMethod,
             final Properties metadataProperties) {
 
         if (!representsAction(actionMethod, methodScope, recognisedHelpersStrategy)) {
@@ -485,9 +492,9 @@ public class FacetedMethodsBuilder {
     }
 
     private FacetedMethod createActionFacetedMethod(
-            final Method actionMethod, 
+            final Method actionMethod,
             final Properties metadataProperties) {
-        
+
         if (!isAllParamTypesValid(actionMethod)) {
             return null;
         }
@@ -516,8 +523,8 @@ public class FacetedMethodsBuilder {
     }
 
     private boolean representsAction(
-            final Method actionMethod, 
-            final MethodScope methodScope, 
+            final Method actionMethod,
+            final MethodScope methodScope,
             final RecognisedHelpersStrategy recognisedHelpersStrategy) {
 
         if (!MethodUtil.inScope(actionMethod, methodScope)) {
@@ -527,7 +534,8 @@ public class FacetedMethodsBuilder {
         final List<Class<?>> typesToLoad = new ArrayList<Class<?>>();
         specificationTraverser.traverseTypes(actionMethod, typesToLoad);
 
-        final boolean anyLoadedAsNull = getSpecificationLoader().loadSpecifications(typesToLoad);
+        final boolean anyLoadedAsNull = getSpecificationLoader()
+                .loadSpecifications(typesToLoad, null, IntrospectionState.TYPE_INTROSPECTED);
         if (anyLoadedAsNull) {
             return false;
         }
@@ -586,10 +594,10 @@ public class FacetedMethodsBuilder {
      * but appends to provided {@link List} (collecting parameter pattern).
      */
     private void findAndRemovePrefixedNonVoidMethods(
-            final MethodScope methodScope, 
-            final String prefix, 
-            final Class<?> returnType, 
-            final int paramCount, 
+            final MethodScope methodScope,
+            final String prefix,
+            final Class<?> returnType,
+            final int paramCount,
             final List<Method> methodListToAppendTo) {
         final List<Method> matchingMethods = findAndRemovePrefixedMethods(methodScope, prefix, returnType, false, paramCount);
         methodListToAppendTo.addAll(matchingMethods);
@@ -600,10 +608,10 @@ public class FacetedMethodsBuilder {
      * removing it from the {@link #methods array of methods} if found.
      */
     private List<Method> findAndRemovePrefixedMethods(
-            final MethodScope methodScope, 
-            final String prefix, 
-            final Class<?> returnType, 
-            final boolean canBeVoid, 
+            final MethodScope methodScope,
+            final String prefix,
+            final Class<?> returnType,
+            final boolean canBeVoid,
             final int paramCount) {
         return MethodUtil.removeMethods(methods, methodScope, prefix, returnType, canBeVoid, paramCount);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState.java
new file mode 100644
index 0000000..e200ef5
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState.java
@@ -0,0 +1,43 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.core.metamodel.specloader.specimpl;
+
+public enum IntrospectionState implements Comparable<IntrospectionState> {
+    /**
+     * ObjectSpecIdFacet only.
+     */
+    NOT_INTROSPECTED,
+
+    /**
+     * Interim stage, to avoid infinite loops while on way to being {@link #TYPE_INTROSPECTED}
+     */
+    TYPE_BEING_INTROSPECTED,
+    /**
+     * Type has been introspected (but not its members).
+     */
+    TYPE_INTROSPECTED,
+
+    /**
+     * Interim stage, to avoid infinite loops while on way to being {@link #TYPE_AND_MEMBERS_INTROSPECTED}
+     */
+    MEMBERS_BEING_INTROSPECTED,
+    /**
+     * Fully introspected... class and also its members.
+     */
+    TYPE_AND_MEMBERS_INTROSPECTED
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 4c1fd02..57129a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -427,11 +427,11 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
             
             // check type, but wrap first 
             // (eg we treat int.class and java.lang.Integer.class as compatible with each other)
-            final Class<? extends Object> choiceClass = object.getClass();
+            final Class<?> choiceClass = object.getClass();
             final Class<?> paramClass = paramSpec.getCorrespondingClass();
             
-            final Class<? extends Object> choiceWrappedClass = ClassExtensions.asWrappedIfNecessary(choiceClass);
-            final Class<? extends Object> paramWrappedClass = ClassExtensions.asWrappedIfNecessary(paramClass);
+            final Class<?> choiceWrappedClass = ClassExtensions.asWrappedIfNecessary(choiceClass);
+            final Class<?> paramWrappedClass = ClassExtensions.asWrappedIfNecessary(paramClass);
             
             final ObjectSpecification choiceWrappedSpec = specificationLookup.loadSpecification(choiceWrappedClass);
             final ObjectSpecification paramWrappedSpec = specificationLookup.loadSpecification(paramWrappedClass);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index fe9b14d..9980dbf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -328,7 +328,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
     /**
      * For mixins
      */
-    protected ObjectAdapter mixinAdapterFor(
+    ObjectAdapter mixinAdapterFor(
             final Class<?> mixinType,
             final ObjectAdapter mixedInAdapter) {
         final ObjectSpecification objectSpecification = getSpecificationLoader().loadSpecification(mixinType);
@@ -337,7 +337,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
         return getPersistenceSessionService().adapterFor(mixinPojo);
     }
 
-    public static String determineNameFrom(final ObjectAction mixinAction) {
+    static String determineNameFrom(final ObjectAction mixinAction) {
         return StringExtensions.asCapitalizedName(suffix(mixinAction));
     }
 
@@ -350,7 +350,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
         return suffix.replaceAll(" ","");
     }
 
-    static String suffix(final ObjectAction mixinAction) {
+    private static String suffix(final ObjectAction mixinAction) {
         return deriveMemberNameFrom(mixinAction.getOnType().getSingularName());
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 9bf2e7d..a238827 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -64,7 +64,6 @@ import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
@@ -97,12 +96,14 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
+import org.apache.isis.core.metamodel.specloader.postprocessor.PostProcessor;
 import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
 
 public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
 
     private final static Logger LOG = LoggerFactory.getLogger(ObjectSpecificationAbstract.class);
 
+
     private static class SubclassList {
         private final List<ObjectSpecification> classes = Lists.newArrayList();
 
@@ -127,12 +128,10 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     protected final ServicesInjector servicesInjector;
 
     private final DeploymentCategory deploymentCategory;
+    private PostProcessor postProcessor;
     private final SpecificationLoader specificationLoader;
     private final FacetProcessor facetProcessor;
 
-    /**
-     * Only populated once {@link #introspectTypeHierarchyAndMembers()} is called.
-     */
     protected Properties metadataProperties;
 
 
@@ -174,7 +173,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     private IconFacet iconFacet;
     private CssClassFacet cssClassFacet;
 
-    private IntrospectionState introspected = IntrospectionState.NOT_INTROSPECTED;
+    private IntrospectionState introspectionState = IntrospectionState.NOT_INTROSPECTED;
     //endregion
 
     //region > Constructor
@@ -182,7 +181,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
             final Class<?> introspectedClass,
             final String shortName,
             final ServicesInjector servicesInjector,
-            final FacetProcessor facetProcessor) {
+            final FacetProcessor facetProcessor,
+            final PostProcessor postProcessor) {
 
         this.correspondingClass = introspectedClass;
         this.fullName = introspectedClass.getName();
@@ -196,6 +196,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
 
         this.specificationLoader = servicesInjector.getSpecificationLoader();
         this.deploymentCategory = servicesInjector.getDeploymentCategoryProvider().getDeploymentCategory();
+        this.postProcessor = postProcessor;
     }
 
     
@@ -245,40 +246,59 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
         return fullName;
     }
 
-    
-    public enum IntrospectionState {
-        NOT_INTROSPECTED,
-        BEING_INTROSPECTED,
-        INTROSPECTED,
-    }
+    //endregion
+
+    //region > Introspection
+
 
     /**
-     * Only if {@link #setIntrospectionState(org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract.IntrospectionState)}
-     * has been called (should be called within {@link #updateFromFacetValues()}.
+     * Keeps introspecting up to the level required.
      */
-    public IntrospectionState getIntrospectionState() {
-        return introspected;
-    }
+    public void introspectUpTo(final IntrospectionState upTo) {
+
+        LOG.debug("introspectingUpTo: {}, {}", getFullIdentifier(), upTo);
+
+        switch (introspectionState) {
+        case NOT_INTROSPECTED:
+            if(this.introspectionState.compareTo(upTo) < 0) {
+                // set to avoid infinite loops
+                this.introspectionState = IntrospectionState.TYPE_BEING_INTROSPECTED;
+                introspectTypeHierarchy();
+                updateFromFacetValues();
+                this.introspectionState = IntrospectionState.TYPE_INTROSPECTED;
+            }
 
-    public void setIntrospectionState(IntrospectionState introspectationState) {
-        this.introspected = introspectationState;
-    }
-    
-    protected boolean isNotIntrospected() {
-        return !(getIntrospectionState() == IntrospectionState.INTROSPECTED);
+            if(this.introspectionState.compareTo(upTo) < 0) {
+                this.introspectionState = IntrospectionState.MEMBERS_BEING_INTROSPECTED;
+                introspectMembers();
+                this.introspectionState = IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED;
+            }
+            // set to avoid infinite loops
+            break;
+        case TYPE_BEING_INTROSPECTED:
+            // nothing to do
+            break;
+        case TYPE_INTROSPECTED:
+            if(this.introspectionState.compareTo(upTo) < 0) {
+                // set to avoid infinite loops
+                this.introspectionState = IntrospectionState.MEMBERS_BEING_INTROSPECTED;
+                introspectMembers();
+                this.introspectionState = IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED;
+            }
+            break;
+        case MEMBERS_BEING_INTROSPECTED:
+            // nothing to do
+        case TYPE_AND_MEMBERS_INTROSPECTED:
+            // nothing to do
+            break;
+        }
     }
 
-    //endregion
-
-    //region > Introspection (part 1)
+    protected abstract void introspectTypeHierarchy();
+    protected abstract void introspectMembers();
 
-    public abstract void introspectTypeHierarchyAndMembers();
 
-    /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
-     * .
-     */
-    protected void updateSuperclass(final Class<?> superclass) {
+    protected void loadSpecOfSuperclass(final Class<?> superclass) {
         if (superclass == null) {
             return;
         }
@@ -291,20 +311,12 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
         }
     }
 
-    /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
-     * .
-     */
     protected void updateInterfaces(final List<ObjectSpecification> interfaces) {
         this.interfaces.clear();
         this.interfaces.addAll(interfaces);
     }
 
-    /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
-     * .
-     */
-    protected void updateAsSubclassTo(final ObjectSpecification supertypeSpec) {
+    private void updateAsSubclassTo(final ObjectSpecification supertypeSpec) {
         if (!(supertypeSpec instanceof ObjectSpecificationAbstract)) {
             return;
         }
@@ -314,10 +326,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
         introspectableSpec.updateSubclasses(this);
     }
 
-    /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
-     * .
-     */
     protected void updateAsSubclassTo(final List<ObjectSpecification> supertypeSpecs) {
         for (final ObjectSpecification supertypeSpec : supertypeSpecs) {
             updateAsSubclassTo(supertypeSpec);
@@ -350,11 +358,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
         }
     }
 
-    //endregion
-
-    //region > Introspection (part 2)
 
-    public void updateFromFacetValues() {
+    private void updateFromFacetValues() {
 
         titleFacet = getFacet(TitleFacet.class);
         iconFacet = getFacet(IconFacet.class);
@@ -378,6 +383,9 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
         }
     }
 
+    protected void postProcess() {
+        postProcessor.postProcess(this);
+    }
     //endregion
 
     //region > Title, Icon
@@ -438,9 +446,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
      * spec2.isOfType(spec1);
      * </pre>
      * 
-     * <p>
-     * Callable after {@link #introspectTypeHierarchyAndMembers()} has been
-     * called.
      */
     @Override
     public boolean isOfType(final ObjectSpecification specification) {
@@ -622,7 +627,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
         return transitiveSubclasses;
     }
 
-    private SubclassList appendSubclasses(
+    private void appendSubclasses(
             final ObjectSpecification objectSpecification,
             final SubclassList appendTo) {
 
@@ -632,7 +637,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
             appendSubclasses(subclass, appendTo);
         }
 
-        return appendTo;
     }
 
     @Override
@@ -650,6 +654,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     //region > Associations
     @Override
     public List<ObjectAssociation> getAssociations(final Contributed contributed) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         // the "contributed.isIncluded()" guard is required because we cannot do this too early;
         // there must be a session available
         if(contributed.isIncluded() && !contributeeAndMixedInAssociationsAdded) {
@@ -675,6 +681,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
 
     @Override
     public ObjectMember getMember(final String memberId) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         final ObjectAction objectAction = getObjectAction(memberId);
         if(objectAction != null) {
             return objectAction;
@@ -703,6 +711,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
      */
     @Override
     public ObjectAssociation getAssociation(final String id) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         ObjectAssociation oa = getAssociationWithId(id);
         if(oa != null) {
             return oa;
@@ -744,11 +754,15 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     @Deprecated
     @Override
     public List<ObjectAssociation> getAssociations(Filter<ObjectAssociation> filter) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         return getAssociations(Contributed.INCLUDED, filter);
     }
 
     @Override
     public List<ObjectAssociation> getAssociations(Contributed contributed, final Filter<ObjectAssociation> filter) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         final List<ObjectAssociation> allAssociations = getAssociations(contributed);
         return Lists.newArrayList(
                 FluentIterable.from(allAssociations)
@@ -760,6 +774,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     public List<OneToOneAssociation> getProperties(Contributed contributed) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         final List list = getAssociations(contributed, ObjectAssociation.Filters.PROPERTIES);
         return list;
     }
@@ -767,6 +783,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public List<OneToManyAssociation> getCollections(Contributed contributed) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         final List list = getAssociations(contributed, ObjectAssociation.Filters.COLLECTIONS);
         return list;
     }
@@ -780,6 +798,10 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
             final Contributed contributed, 
             final Filter<ObjectAction> filter) {
 
+        LOG.debug("{} : getObjectActions(...)", this.getFullIdentifier());
+
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         // update our list of actions if requesting for contributed actions
         // and they have not yet been added
         // the "contributed.isIncluded()" guard is required because we cannot do this too early;
@@ -787,15 +809,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
         if(contributed.isIncluded() && !contributeeAndMixedInActionsAdded) {
             synchronized (this.objectActions) {
                 final List<ObjectAction> actions = Lists.newArrayList(this.objectActions);
-                final boolean containsMixin = containsDoOpFacet(MixinFacet.class);
-                final boolean containsDomainService = containsDoOpFacet(DomainServiceFacet.class);
-                final boolean isService = isService();
-                if (containsMixin || containsDomainService || isService) {
-                    // don't contribute to mixins themselves!
-                    // don't contribute to services either
-                    // - isService() is sufficient check for internal services registered directly with ServicesInjector
-                    // - checking for DomainServiceFacet is for application services (isService() may not have been called, for these)
-                } else {
+                if (isPersistenceCapableOrViewModel()) {
+                    // only contribute to entities and view models (not to mixins themselves, nor domain services, nor values).
                     actions.addAll(createContributeeActions());
                     actions.addAll(createMixedInActions());
                 }
@@ -819,6 +834,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     @Override
     public List<ObjectAction> getObjectActions(
             final Contributed contributed) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         return getObjectActions(ActionType.ALL, contributed, Filters.<ObjectAction>any());
     }
 
@@ -827,6 +844,9 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
             final ActionType type, 
             final Contributed contributed, 
             final Filter<ObjectAction> filter) {
+
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         return getObjectActions(Collections.singletonList(type), contributed, filter);
     }
 
@@ -834,7 +854,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
 
     //region > sorting
 
-    protected List<ObjectAssociation> sortAssociations(final List<ObjectAssociation> associations) {
+    private List<ObjectAssociation> sortAssociations(final List<ObjectAssociation> associations) {
         final DeweyOrderSet orderSet = DeweyOrderSet.createOrderSet(associations);
         final MemberGroupLayoutFacet memberGroupLayoutFacet = this.getFacet(MemberGroupLayoutFacet.class);
         
@@ -867,7 +887,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
         }
     }
 
-    protected static List<ObjectAction> sortActions(final List<ObjectAction> actions) {
+    private static List<ObjectAction> sortActions(final List<ObjectAction> actions) {
         final DeweyOrderSet orderSet = DeweyOrderSet.createOrderSet(actions);
         final List<ObjectAction> orderedActions = Lists.newArrayList();
         sortActions(orderSet, orderedActions);
@@ -914,7 +934,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     private void addContributeeAssociationsIfAny(
             final Object servicePojo, final List<ObjectAssociation> contributeeAssociationsToAppendTo) {
         final Class<?> serviceClass = servicePojo.getClass();
-        final ObjectSpecification specification = specificationLoader.loadSpecification(serviceClass);
+        final ObjectSpecification specification = specificationLoader.loadSpecification(serviceClass,
+                IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
         if (specification == this) {
             return;
         }
@@ -924,7 +945,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
 
     private List<ObjectAssociation> createContributeeAssociations(final Object servicePojo) {
         final Class<?> serviceClass = servicePojo.getClass();
-        final ObjectSpecification specification = specificationLoader.loadSpecification(serviceClass);
+        final ObjectSpecification specification = specificationLoader.loadSpecification(serviceClass,
+                IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
         final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.USER, Contributed.INCLUDED, Filters
                 .<ObjectAction>any());
 
@@ -1010,7 +1032,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     private void addMixedInAssociationsIfAny(
             final Class<?> mixinType, final List<ObjectAssociation> toAppendTo) {
 
-        final ObjectSpecification specification = getSpecificationLoader().loadSpecification(mixinType);
+        final ObjectSpecification specification = getSpecificationLoader().loadSpecification(mixinType,
+                IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
         if (specification == this) {
             return;
         }
@@ -1088,7 +1111,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
      * If this specification {@link #isService() is actually for} a service,
      * then returns an empty list.
      */
-    protected List<ObjectAction> createContributeeActions() {
+    private List<ObjectAction> createContributeeActions() {
         if (isService() || isValue()) {
             return Collections.emptyList();
         }
@@ -1103,8 +1126,12 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
     private void addContributeeActionsIfAny(
             final Object servicePojo,
             final List<ObjectAction> contributeeActionsToAppendTo) {
+
+        LOG.debug("{} : addContributeeActionsIfAny(...); servicePojo class is: {}", this.getFullIdentifier(), servicePojo.getClass().getName());
+
         final Class<?> serviceType = servicePojo.getClass();
-        final ObjectSpecification specification = getSpecificationLoader().loadSpecification(serviceType);
+        final ObjectSpecification specification = getSpecificationLoader().loadSpecification(serviceType,
+                IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
         if (specification == this) {
             return;
         }
@@ -1166,7 +1193,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
      * If this specification {@link #isService() is actually for} a service,
      * then returns an empty list.
      */
-    protected List<ObjectAction> createMixedInActions() {
+    private List<ObjectAction> createMixedInActions() {
         if (isService() || isValue()) {
             return Collections.emptyList();
         }
@@ -1187,7 +1214,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
             final Class<?> mixinType,
             final List<ObjectAction> mixedInActionsToAppendTo) {
 
-        final ObjectSpecification mixinSpec = getSpecificationLoader().loadSpecification(mixinType);
+        final ObjectSpecification mixinSpec = getSpecificationLoader().loadSpecification(mixinType,
+                IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
         if (mixinSpec == this) {
             return;
         }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 28b5a39..55d222d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -63,8 +63,10 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
+import org.apache.isis.core.metamodel.specloader.postprocessor.PostProcessor;
 import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder;
 import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilderContext;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
 import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
 import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationDefault;
@@ -97,45 +99,50 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
             final FacetedMethodsBuilderContext facetedMethodsBuilderContext,
             final ServicesInjector servicesInjector,
             final FacetProcessor facetProcessor,
-            final NatureOfService natureOfServiceIfAny) {
+            final NatureOfService natureOfServiceIfAny,
+            final PostProcessor postProcessor) {
         super(correspondingClass, determineShortName(correspondingClass),
-                servicesInjector, facetProcessor);
+                servicesInjector, facetProcessor, postProcessor);
 
         this.isService = natureOfServiceIfAny != null;
         this.facetedMethodsBuilder = new FacetedMethodsBuilder(this, facetedMethodsBuilderContext);
+
+        facetProcessor.processObjectSpecId(correspondingClass, this);
     }
 
 
     //endregion
 
     //region > introspectTypeHierarchyAndMembers
+
     @Override
-    public void introspectTypeHierarchyAndMembers() {
+    protected void introspectTypeHierarchy() {
+
+        metadataProperties = facetedMethodsBuilder.introspectClass();
 
-        metadataProperties = null;
-        if(isNotIntrospected()) {
-            metadataProperties = facetedMethodsBuilder.introspectClass();
-        }
-        
         // name
-        if(isNotIntrospected()) {
-            addNamedFacetAndPluralFacetIfRequired();
-        }
+        addNamedFacetAndPluralFacetIfRequired();
 
         // go no further if a value
         if(this.containsFacet(ValueFacet.class)) {
             if (LOG.isDebugEnabled()) {
-                LOG.debug("skipping full introspection for value type {}", getFullIdentifier());
+                LOG.debug("skipping type hierarchy introspection for value type {}", getFullIdentifier());
             }
             return;
         }
 
-        // superclass
-        if(isNotIntrospected()) {
-            final Class<?> superclass = getCorrespondingClass().getSuperclass();
-            updateSuperclass(superclass);
+        final DomainServiceFacet facet = getFacet(DomainServiceFacet.class);
+        final boolean serviceWithNatureOfDomain = facet != null && facet.getNatureOfService() == NatureOfService.DOMAIN;
+        if (serviceWithNatureOfDomain) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("skipping type hierarchy introspection for domain service with natureOfService = DOMAIN {}", getFullIdentifier());
+            }
+            return;
         }
 
+        // superclass
+        final Class<?> superclass = getCorrespondingClass().getSuperclass();
+        loadSpecOfSuperclass(superclass);
 
         // walk superinterfaces
 
@@ -158,32 +165,28 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
             }
         }
 
-        if(isNotIntrospected()) {
-            updateAsSubclassTo(interfaceSpecList);
-        }
-        if(isNotIntrospected()) {
-            updateInterfaces(interfaceSpecList);
-        }
+        updateAsSubclassTo(interfaceSpecList);
+        updateInterfaces(interfaceSpecList);
 
-        updateAssociationsAndActions();
     }
 
-    private synchronized void updateAssociationsAndActions() {
+    protected synchronized void introspectMembers() {
 
-        // associations and actions
-        if(isNotIntrospected()) {
-            final List<ObjectAssociation> associations = createAssociations(metadataProperties);
-            sortAndUpdateAssociations(associations);
+        if(this.containsFacet(ValueFacet.class)) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("skipping full introspection for value type {}", getFullIdentifier());
+            }
+            return;
         }
 
-        if(isNotIntrospected()) {
-            final List<ObjectAction> actions = createActions(metadataProperties);
-            sortCacheAndUpdateActions(actions);
-        }
+        // associations and actions
+        final List<ObjectAssociation> associations = createAssociations(metadataProperties);
+        sortAndUpdateAssociations(associations);
 
-        if(isNotIntrospected()) {
-            updateFromFacetValues();
-        }
+        final List<ObjectAction> actions = createActions(metadataProperties);
+        sortCacheAndUpdateActions(actions);
+
+        postProcess();
     }
 
     private void addNamedFacetAndPluralFacetIfRequired() {
@@ -324,21 +327,27 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
 
     @Override
     public ObjectAction getObjectAction(final ActionType type, final String id, final List<ObjectSpecification> parameters) {
-        final List<ObjectAction> actions = 
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
+        final List<ObjectAction> actions =
                 getObjectActions(type, Contributed.INCLUDED, Filters.<ObjectAction>any());
         return firstAction(actions, id, parameters);
     }
 
     @Override
     public ObjectAction getObjectAction(final ActionType type, final String id) {
-        final List<ObjectAction> actions = 
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
+        final List<ObjectAction> actions =
                 getObjectActions(type, Contributed.INCLUDED, Filters.<ObjectAction>any()); 
         return firstAction(actions, id);
     }
 
     @Override
     public ObjectAction getObjectAction(final String id) {
-        final List<ObjectAction> actions = 
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
+        final List<ObjectAction> actions =
                 getObjectActions(ActionType.ALL, Contributed.INCLUDED, Filters.<ObjectAction>any()); 
         return firstAction(actions, id);
     }
@@ -389,6 +398,8 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
     //region > getMember, catalog... (not API)
 
     public ObjectMember getMember(final Method method) {
+        introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+
         if (membersByMethod == null) {
             this.membersByMethod = catalogueMembers();
         }
@@ -405,8 +416,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
     private void cataloguePropertiesAndCollections(final Map<Method, ObjectMember> membersByMethod) {
         final Filter<ObjectAssociation> noop = Filters.anyOfType(ObjectAssociation.class);
         final List<ObjectAssociation> fields = getAssociations(Contributed.EXCLUDED, noop);
-        for (int i = 0; i < fields.size(); i++) {
-            final ObjectAssociation field = fields.get(i);
+        for (final ObjectAssociation field : fields) {
             final List<Facet> facets = field.getFacets(ImperativeFacet.FILTER);
             for (final Facet facet : facets) {
                 final ImperativeFacet imperativeFacet = ImperativeFacet.Util.getImperativeFacet(facet);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index c429804..5ed83a5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -33,6 +33,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
+import org.apache.isis.core.metamodel.specloader.postprocessor.PostProcessor;
 import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
 
 /**
@@ -49,9 +50,13 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
 
     public ObjectSpecificationOnStandaloneList(
             final ServicesInjector servicesInjector,
-            final FacetProcessor facetProcessor) {
-        super(FreeStandingList.class, NAME, servicesInjector, facetProcessor);
+            final FacetProcessor facetProcessor,
+            final PostProcessor postProcessor) {
+        super(FreeStandingList.class, NAME, servicesInjector, facetProcessor, postProcessor);
         this.specId = new ObjectSpecId(getCorrespondingClass().getName());
+
+        FacetUtil.addFacet(
+                new ObjectSpecIdFacetOnStandaloneList(specId, this));
     }
 
     //endregion
@@ -59,8 +64,8 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
     //region > Introspection
 
     @Override
-    public void introspectTypeHierarchyAndMembers() {
-        updateSuperclass(Object.class);
+    protected void introspectTypeHierarchy() {
+        loadSpecOfSuperclass(Object.class);
 
         addFacet(new CollectionFacetOnStandaloneList(this));
         addFacet(new TypeOfFacetDefaultToObject(this, getSpecificationLoader()) {
@@ -74,6 +79,10 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
         // don't install anything for NotPersistableFacet
     }
 
+    protected void introspectMembers() {
+        // no-op.
+    }
+
     //endregion
 
     //region > isXxx
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
index 303f24c..4596ce2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
@@ -20,16 +20,22 @@
 package org.apache.isis.objectstore.jdo.metamodel.facets.object.discriminator;
 
 import javax.jdo.annotations.Discriminator;
+
 import com.google.common.base.Strings;
+
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.Annotations;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 
-public class JdoDiscriminatorAnnotationFacetFactory extends FacetFactoryAbstract {
+public class JdoDiscriminatorAnnotationFacetFactory
+        extends FacetFactoryAbstract
+        implements ObjectSpecIdFacetFactory {
 
     private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
 
@@ -38,7 +44,7 @@ public class JdoDiscriminatorAnnotationFacetFactory extends FacetFactoryAbstract
     }
 
     @Override
-    public void process(ProcessClassContext processClassContext) {
+    public void process(final ProcessObjectSpecIdContext processClassContext) {
 
         // only applies to JDO entities; ignore any view models
         final Class<?> cls = processClassContext.getCls();
@@ -46,21 +52,38 @@ public class JdoDiscriminatorAnnotationFacetFactory extends FacetFactoryAbstract
             return;
         }
 
-        final Discriminator annotation = Annotations.getAnnotation(processClassContext.getCls(), Discriminator.class);
+        final Discriminator annotation = Annotations.getAnnotation(cls, Discriminator.class);
         if (annotation == null) {
             return;
         }
-        String annotationValueAttribute = annotation.value();
-        if(!Strings.isNullOrEmpty(annotationValueAttribute)) {
-            FacetUtil.addFacet(new ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation(annotationValueAttribute, processClassContext.getFacetHolder()));
-        } else {
-            final FacetHolder facetHolder = processClassContext.getFacetHolder();
-            final Class<?> originalClass = processClassContext.getCls();
-            final Class<?> substitutedClass = classSubstitutor.getClass(originalClass);
-            FacetUtil.addFacet(new ObjectSpecIdFacetDerivedFromClassName(substitutedClass.getCanonicalName(), facetHolder));
+        final FacetHolder facetHolder = processClassContext.getFacetHolder();
+
+        final String annotationValue = annotation.value();
+        final ObjectSpecIdFacet facet =
+                !Strings.isNullOrEmpty(annotationValue)
+                        ? new ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation(
+                        annotationValue, facetHolder)
+                        : new ObjectSpecIdFacetDerivedFromClassName(
+                        classSubstitutor.getClass(cls).getCanonicalName(), facetHolder);
+        FacetUtil.addFacet(facet);
+    }
+
+    @Override
+    public void process(ProcessClassContext processClassContext) {
+
+        // only applies to JDO entities; ignore any view models
+        final Class<?> cls = processClassContext.getCls();
+        if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+            return;
         }
+        final FacetHolder facetHolder = processClassContext.getFacetHolder();
 
-        FacetUtil.addFacet(new JdoDiscriminatorFacetDefault(annotationValueAttribute, processClassContext.getFacetHolder()));
+        final Discriminator annotation = Annotations.getAnnotation(cls, Discriminator.class);
+        if (annotation == null) {
+            return;
+        }
+        final String annotationValueAttribute = annotation.value();
+        FacetUtil.addFacet(new JdoDiscriminatorFacetDefault(annotationValueAttribute, facetHolder));
     }
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
index 4ea41a2..66e0c3d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
@@ -28,16 +28,22 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.Annotations;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
 
-
-public class JdoPersistenceCapableAnnotationFacetFactory extends FacetFactoryAbstract {
+/**
+ * Implements {@link ObjectSpecIdFacetFactory} only because is a prereq of {@link DomainObjectAnnotationFacetFactory}.
+ */
+public class JdoPersistenceCapableAnnotationFacetFactory
+        extends FacetFactoryAbstract
+        implements ObjectSpecIdFacetFactory {
 
     public JdoPersistenceCapableAnnotationFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
     }
 
     @Override
-    public void process(ProcessClassContext processClassContext) {
+    public void process(ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext processClassContext) {
         final Class<?> cls = processClassContext.getCls();
 
         // only applies to JDO entities; ignore any view models
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java
index 8ee9f07..d56afc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java
@@ -23,6 +23,7 @@ import java.util.Objects;
 
 import org.apache.isis.core.metamodel.spec.Hierarchical;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
 
 class VisitorForFromClause extends VisitorForClauseAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
index 91595b3..1a38e19 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
@@ -19,6 +19,7 @@
 package org.apache.isis.objectstore.jdo.metamodel.facets.object.query;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
 import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
 
@@ -43,7 +44,8 @@ class VisitorForVariablesClause extends VisitorForClauseAbstract {
 
         final String className = objectSpec.getCorrespondingClass().getName();
 
-        ObjectSpecification objectSpecification = getSpecificationLoader().loadSpecification(classNameFromClause);
+        ObjectSpecification objectSpecification = getSpecificationLoader().loadSpecification(classNameFromClause,
+                IntrospectionState.TYPE_INTROSPECTED);
         JdoPersistenceCapableFacet persistenceCapableFacet =
                 objectSpecification.getFacet(JdoPersistenceCapableFacet.class);
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index ee5c697..d097e30 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -192,6 +192,7 @@ import org.apache.isis.core.metamodel.facets.value.shortint.ShortPrimitiveValueF
 import org.apache.isis.core.metamodel.facets.value.shortint.ShortWrapperValueFacetUsingSemanticsProviderFactory;
 import org.apache.isis.core.metamodel.facets.value.string.StringValueFacetUsingSemanticsProviderFactory;
 import org.apache.isis.core.metamodel.facets.value.time.TimeValueFacetUsingSemanticsProviderFactory;
+import org.apache.isis.core.metamodel.facets.value.timejodalocal.JodaLocalTimeValueFacetSimpleFactory;
 import org.apache.isis.core.metamodel.facets.value.timesql.JavaSqlTimeValueFacetUsingSemanticsProviderFactory;
 import org.apache.isis.core.metamodel.facets.value.timestamp.TimeStampValueFacetUsingSemanticsProviderFactory;
 import org.apache.isis.core.metamodel.facets.value.timestampsql.JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory;
@@ -508,6 +509,7 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
         addFactory(new JodaLocalDateValueFacetUsingSemanticsProviderFactory());
         addFactory(new JodaLocalDateTimeValueFacetUsingSemanticsProviderFactory());
         addFactory(new JodaDateTimeValueFacetUsingSemanticsProviderFactory());
+        addFactory(new JodaLocalTimeValueFacetSimpleFactory());
 
         // written to not trample over TypeOf if already installed
         addFactory(new CollectionFacetFactory());
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
index 07e3ba4..fac2966 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
@@ -23,6 +23,7 @@ import org.hamcrest.CoreMatchers;
 import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.apache.isis.applib.annotation.ActionLayout;
 import org.apache.isis.applib.annotation.Contributed;
 import org.apache.isis.applib.annotation.DomainObject;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
index 0ab88ba..5584386 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.notcontributed.derived;
 import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
index cc504a9..fcde303 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived;
 import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
index 8bf3101..b869c70 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
@@ -21,13 +21,14 @@ package org.apache.isis.core.metamodel.facets.object.domainobject;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.apache.isis.applib.annotation.ObjectType;
 import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
 import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetFromObjectTypeAnnotation;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 
+import static org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -48,13 +49,13 @@ public class ObjectTypeAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
         @ObjectType("CUS")
         class Customer {
         }
-        
+
         expectNoMethodsRemoved();
-        
-        facetFactory.processObjectType(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetHolder));
+
+        facetFactory.processObjectType(new ProcessObjectSpecIdContext(Customer.class, facetHolder));
 
         final ObjectSpecIdFacet facet = facetHolder.getFacet(ObjectSpecIdFacet.class);
-        
+
         assertThat(facet, is(not(nullValue())));
         assertThat(facet instanceof ObjectSpecIdFacetFromObjectTypeAnnotation, is(true));
         assertThat(facet.value(), is(ObjectSpecId.of("CUS")));
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
index 2548b88..d08bc25 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
@@ -22,13 +22,16 @@ package org.apache.isis.core.metamodel.facets.object.objectspecid;
 import org.datanucleus.testing.dom.CustomerAsProxiedByDataNucleus;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassNameFactory;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 public class ObjectSpecIdFacetDerivedFromClassNameFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
@@ -47,7 +50,7 @@ public class ObjectSpecIdFacetDerivedFromClassNameFactoryTest extends AbstractFa
     public void installsFacet_passedThroughClassSubstitutor() {
         expectNoMethodsRemoved();
 
-        facetFactory.process(new ProcessClassContext(CustomerAsProxiedByDataNucleus.class, mockMethodRemover, facetHolder));
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(CustomerAsProxiedByDataNucleus.class, facetHolder));
 
         final ObjectSpecIdFacet facet = facetHolder.getFacet(ObjectSpecIdFacet.class);
         
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 2d487c9..55efc2b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -80,6 +80,7 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
 import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 
 import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
 import static org.hamcrest.CoreMatchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
index 3c99d61..d425b8c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAbstract {
 
-    public abstract static class TestDomainObject implements Persistable {
+    abstract static class TestDomainObject implements Persistable {
     }
 
     @Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
index 25065c0..8fe0ea6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
@@ -26,12 +26,13 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 
 public class SpecificationLoaderTest_array extends SpecificationLoaderTestAbstract {
 
     @Override
     protected ObjectSpecification loadSpecification(final SpecificationLoader reflector) {
-        return reflector.loadSpecification(ReflectorTestPojo[].class);
+        return reflector.loadSpecification(ReflectorTestPojo[].class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
     }
 
     @Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
index 6a6df8b..453daa7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
@@ -28,12 +28,13 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 
 public class SpecificationLoaderTest_collection extends SpecificationLoaderTestAbstract {
 
     @Override
     protected ObjectSpecification loadSpecification(final SpecificationLoader reflector) {
-        return reflector.loadSpecification(Vector.class);
+        return reflector.loadSpecification(Vector.class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
     }
 
     @Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
index f942a0a..c9d0088 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
@@ -23,12 +23,13 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 
 public class SpecificationLoaderTest_value extends SpecificationLoaderTestAbstract {
 
     @Override
     protected ObjectSpecification loadSpecification(final SpecificationLoader reflector) {
-        return reflector.loadSpecification(String.class);
+        return reflector.loadSpecification(String.class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
     }
 
     @Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
new file mode 100644
index 0000000..031648d
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
@@ -0,0 +1,72 @@
+package org.apache.isis.core.metamodel.specloader.specimpl;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.Test;
+
+import static org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState.MEMBERS_BEING_INTROSPECTED;
+import static org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED;
+import static org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState.NOT_INTROSPECTED;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class IntrospectionState_comparable_Test {
+
+    @Test
+    public void all_of_em() throws Exception {
+        assertComparison(NOT_INTROSPECTED, NOT_INTROSPECTED, equal());
+        assertComparison(NOT_INTROSPECTED, MEMBERS_BEING_INTROSPECTED, negative());
+        assertComparison(NOT_INTROSPECTED, TYPE_AND_MEMBERS_INTROSPECTED, negative());
+
+        assertComparison(MEMBERS_BEING_INTROSPECTED, NOT_INTROSPECTED, positive());
+        assertComparison(MEMBERS_BEING_INTROSPECTED, MEMBERS_BEING_INTROSPECTED, equal());
+        assertComparison(MEMBERS_BEING_INTROSPECTED, TYPE_AND_MEMBERS_INTROSPECTED, negative());
+
+        assertComparison(TYPE_AND_MEMBERS_INTROSPECTED, NOT_INTROSPECTED, positive());
+        assertComparison(TYPE_AND_MEMBERS_INTROSPECTED, MEMBERS_BEING_INTROSPECTED, positive());
+        assertComparison(TYPE_AND_MEMBERS_INTROSPECTED, TYPE_AND_MEMBERS_INTROSPECTED, equal());
+    }
+
+    private Matcher<Integer> equal() {
+        return new TypeSafeMatcher<Integer>() {
+            @Override protected boolean matchesSafely(final Integer integer) {
+                return integer == 0;
+            }
+
+            @Override public void describeTo(final Description description) {
+                description.appendText("equal");
+            }
+        };
+    }
+
+    private static Matcher<Integer> negative() {
+        return new TypeSafeMatcher<Integer>() {
+            @Override protected boolean matchesSafely(final Integer integer) {
+                return integer < 0;
+            }
+
+            @Override public void describeTo(final Description description) {
+                description.appendText("negative");
+            }
+        };
+    }
+
+    private static Matcher<Integer> positive() {
+        return new TypeSafeMatcher<Integer>() {
+            @Override protected boolean matchesSafely(final Integer integer) {
+                return integer > 0;
+            }
+
+            @Override public void describeTo(final Description description) {
+                description.appendText("positive");
+            }
+        };
+    }
+
+    private static void assertComparison(
+            final IntrospectionState a,
+            final IntrospectionState b, final Matcher<Integer> matcher) {
+        assertThat(a.compareTo(b), is(matcher));
+    }
+}
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
index 405f3f8..70961fd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
@@ -27,10 +27,11 @@ import org.datanucleus.enhancement.Persistable;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
 
 public class GivenJdoDiscriminatorAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
 
@@ -75,7 +76,7 @@ public class GivenJdoDiscriminatorAnnotationFacetFactoryTest extends AbstractFac
         abstract class Customer implements Persistable {
         }
         
-        facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
         
         final Facet facet = facetHolder.getFacet(ObjectSpecIdFacet.class);
         assertNotNull(facet);
@@ -98,7 +99,7 @@ public class GivenJdoDiscriminatorAnnotationFacetFactoryTest extends AbstractFac
         abstract class Customer implements Persistable {
         }
 
-        facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
 
         final ObjectSpecIdFacet discriminatorValueFacet = facetHolder.getFacet(ObjectSpecIdFacet.class);
         assertEquals(ObjectSpecId.of("CUS"), discriminatorValueFacet.value());
diff --git a/core/metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
index 7e12e4b..8db0bae 100644
--- a/core/metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
@@ -29,6 +29,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
 
 import junit.framework.Assert;
 
@@ -73,6 +74,7 @@ public class GivenJdoPersistenceCapableAnnotationFacetFactoryTest extends
         abstract class Customer implements Persistable {
         }
 
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
         facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
 
         final Facet facet = facetHolder.getFacet(JdoPersistenceCapableFacet.class);
@@ -85,6 +87,7 @@ public class GivenJdoPersistenceCapableAnnotationFacetFactoryTest extends
         abstract class Customer implements Persistable {
         }
 
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
         facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
 
         final Facet facet = facetHolder.getFacet(JdoPersistenceCapableFacet.class);
@@ -95,6 +98,8 @@ public class GivenJdoPersistenceCapableAnnotationFacetFactoryTest extends
         @PersistenceCapable()
         abstract class Customer implements Persistable {
         }
+
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
         facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
 
         final JdoPersistenceCapableFacet entityFacet = facetHolder
@@ -106,6 +111,8 @@ public class GivenJdoPersistenceCapableAnnotationFacetFactoryTest extends
         @PersistenceCapable()
         abstract class Customer implements Persistable {
         }
+
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
         facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
 
         final JdoPersistenceCapableFacet entityFacet = facetHolder
@@ -118,6 +125,7 @@ public class GivenJdoPersistenceCapableAnnotationFacetFactoryTest extends
         abstract class Customer implements Persistable {
         }
 
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
         facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
 
         final JdoPersistenceCapableFacet entityFacet = facetHolder
@@ -130,6 +138,7 @@ public class GivenJdoPersistenceCapableAnnotationFacetFactoryTest extends
         abstract class Customer implements Persistable {
         }
 
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
         facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
 
         final JdoPersistenceCapableFacet entityFacet = facetHolder
@@ -142,6 +151,7 @@ public class GivenJdoPersistenceCapableAnnotationFacetFactoryTest extends
         abstract class Customer implements Persistable {
         }
 
+        facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
         facetFactory.process(new FacetFactory.ProcessClassContext(Customer.class, methodRemover, facetHolder));
 
         assertNoMethodsRemoved();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
index 04a9eba..b1ca3db 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
@@ -41,11 +41,11 @@ import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
 import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
index dee668a..64c871f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
@@ -57,7 +57,7 @@ public class OptionHandlerInitParameters extends OptionHandlerAbstract {
     @Override
     public void prime(final IsisConfigurationBuilder isisConfigurationBuilder) {
         Map<String,String> additionalProperties = asMap(servletContext);
-        LOG.info("priming configuration builder: {} properties to prime", additionalProperties.size());
+        LOG.debug("priming configuration builder: {} properties to prime", additionalProperties.size());
         addConfigurationProperties(isisConfigurationBuilder, additionalProperties);
     }
 
@@ -78,7 +78,7 @@ public class OptionHandlerInitParameters extends OptionHandlerAbstract {
         for (final String propertyKey : additionalProperties.keySet()) {
             final String propertyValue = additionalProperties.get(propertyKey);
 
-            LOG.info("priming: {}={}", propertyKey, propertyValue);
+            LOG.debug("priming: {}={}", propertyKey, propertyValue);
             isisConfigurationBuilder.add(propertyKey, propertyValue);
         }
     }
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
index bba5ba6..ed9d9e7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
@@ -222,7 +222,7 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
         return properties;
     }
 
-    static Map<String, JdoNamedQuery> catalogNamedQueries(
+    static void catalogNamedQueries(
             Set<String> persistableClassNames, final SpecificationLoader specificationLoader) {
         final Map<String, JdoNamedQuery> namedQueryByName = Maps.newHashMap();
         for (final String persistableClassName: persistableClassNames) {
@@ -235,7 +235,6 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
                 namedQueryByName.put(namedQuery.getName(), namedQuery);
             }
         }
-        return namedQueryByName;
     }
 
     public PersistenceManagerFactory getPersistenceManagerFactory() {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
index 1eee7e2..5fe38a6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
@@ -19,9 +19,12 @@
 package org.apache.isis.core.runtime.system.persistence;
 
 import java.util.Map;
+
 import com.google.common.collect.Maps;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.query.QueryDefault;
 import org.apache.isis.applib.query.QueryFindAllInstances;
@@ -32,7 +35,11 @@ import org.apache.isis.core.metamodel.services.container.query.QueryFindByPatter
 import org.apache.isis.core.metamodel.services.container.query.QueryFindByTitle;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.persistence.query.*;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
 
 public class PersistenceQueryFactory {
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
index 6ca987e..28e9e3b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
@@ -260,7 +260,7 @@ public class IsisSessionFactoryBuilder {
             );
 
             ThreadPoolSupport.getInstance().joinGatherFailures(futures);
-            specificationLoader.postProcess();
+
 
             persistenceSessionFactory.catalogNamedQueries(specificationLoader);
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 680cf05..06d7ba6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -77,7 +77,7 @@ import org.apache.isis.progmodels.dflt.JavaReflectorHelper;
 import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
 
 /**
- * 
+ *
  */
 public abstract class IsisComponentProvider {
 
@@ -152,8 +152,10 @@ public abstract class IsisComponentProvider {
 
         final Set<Class<?>> domainServiceTypes = Sets.newLinkedHashSet();
         domainServiceTypes.addAll(reflections.getTypesAnnotatedWith(DomainService.class));
+
         domainServiceTypes.addAll(reflections.getTypesAnnotatedWith(DomainServiceLayout.class));
 
+
         final Set<Class<?>> persistenceCapableTypes = Sets.newLinkedHashSet();
         persistenceCapableTypes.addAll(reflections.getTypesAnnotatedWith(PersistenceCapable.class));
 
@@ -162,17 +164,17 @@ public abstract class IsisComponentProvider {
         // we therefore try to limit the set of fixture types eagerly introspected at startup
         final Set<Class<? extends FixtureScript>> fixtureScriptTypes = Sets.newLinkedHashSet();
         fixtureScriptTypes.addAll(
-            FluentIterable.from(reflections.getSubTypesOf(FixtureScript.class)).
-                filter(new Predicate<Class<?>>(){
-                    @Override
-                    public boolean apply(@Nullable final Class<?> aClass) {
-                        // ignore as a fixture script if annotated with @Programmatic
-                        // (though directly implementing DiscoverableFixtureScript takes precedence and will NOT ignore)
-                        return DiscoverableFixtureScript.class.isAssignableFrom(aClass) ||
-                        Annotations.getAnnotation(aClass, Programmatic.class) == null;
-                    }
-                })
-                .toList());
+                FluentIterable.from(reflections.getSubTypesOf(FixtureScript.class)).
+                        filter(new Predicate<Class<?>>(){
+                            @Override
+                            public boolean apply(@Nullable final Class<?> aClass) {
+                                // ignore as a fixture script if annotated with @Programmatic
+                                // (though directly implementing DiscoverableFixtureScript takes precedence and will NOT ignore)
+                                return DiscoverableFixtureScript.class.isAssignableFrom(aClass) ||
+                                        Annotations.getAnnotation(aClass, Programmatic.class) == null;
+                            }
+                        })
+                        .toList());
 
         final Set<Class<?>> domainObjectTypes = Sets.newLinkedHashSet();
         domainObjectTypes.addAll(reflections.getTypesAnnotatedWith(DomainObject.class));
@@ -208,12 +210,12 @@ public abstract class IsisComponentProvider {
 
         // for a tiny bit of efficiency, we append a '.' to each package name here, outside the loops
         List<String> packagesWithDotSuffix =
-            FluentIterable.from(moduleAndFrameworkPackages).transform(new Function<String, String>() {
-                @Nullable @Override
-                public String apply(@Nullable final String s) {
-                    return s != null ? s + "." : null;
-                }
-            }).toList();
+                FluentIterable.from(moduleAndFrameworkPackages).transform(new Function<String, String>() {
+                    @Nullable @Override
+                    public String apply(@Nullable final String s) {
+                        return s != null ? s + "." : null;
+                    }
+                }).toList();
 
         registry.setDomainServiceTypes(withinPackageAndNotAnonymous(packagesWithDotSuffix, domainServiceTypes));
         registry.setPersistenceCapableTypes(withinPackageAndNotAnonymous(packagesWithDotSuffix, persistenceCapableTypes));
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index b15f156..deff2d1 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -407,8 +407,8 @@ public class IsisWicketApplication
 
             if(getDeploymentCategory().isPrototyping()) {
                 DebugDiskDataStore.register(this);
-                LOG.info("DebugDiskDataStore registered; access via ~/wicket/internal/debug/diskDataStore");
-                LOG.info("DebugDiskDataStore: eg, http://localhost:8080/wicket/wicket/internal/debug/diskDataStore");
+                LOG.debug("DebugDiskDataStore registered; access via ~/wicket/internal/debug/diskDataStore");
+                LOG.debug("DebugDiskDataStore: eg, http://localhost:8080/wicket/wicket/internal/debug/diskDataStore");
             }
 
             if(!getDebugSettings().isDevelopmentUtilitiesEnabled()) {
@@ -429,10 +429,10 @@ public class IsisWicketApplication
                 }
             }
 
-            LOG.info("storeSettings.inmemoryCacheSize        : {}", getStoreSettings().getInmemoryCacheSize());
-            LOG.info("storeSettings.asynchronousQueueCapacity: {}", getStoreSettings().getAsynchronousQueueCapacity());
-            LOG.info("storeSettings.maxSizePerSession        : {}", getStoreSettings().getMaxSizePerSession());
-            LOG.info("storeSettings.fileStoreFolder          : {}", getStoreSettings().getFileStoreFolder());
+            LOG.debug("storeSettings.inmemoryCacheSize        : {}", getStoreSettings().getInmemoryCacheSize());
+            LOG.debug("storeSettings.asynchronousQueueCapacity: {}", getStoreSettings().getAsynchronousQueueCapacity());
+            LOG.debug("storeSettings.maxSizePerSession        : {}", getStoreSettings().getMaxSizePerSession());
+            LOG.debug("storeSettings.fileStoreFolder          : {}", getStoreSettings().getFileStoreFolder());
 
         } catch(RuntimeException ex) {
             // because Wicket's handling in its WicketFilter (that calls this method) does not log the exception.
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 2b2e3d5..1e8db79 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -54,10 +54,10 @@ import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
 import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractAlwaysEverywhere;
 import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
 import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaSetterMethod;
-import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
 import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
index 0548356..640a594 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
@@ -71,7 +71,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet" fqcn="org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics">
                     <mml:attr name="value">domainapp.modules.simple.dom.impl.SimpleObject</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#objects</mml:attr>
                     <mml:attr name="originalText">Objects</mml:attr>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
index ad36bf2..38a06d9 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
@@ -113,7 +113,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
                     <mml:attr name="value">SAFE</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#datanucleusIdLong()</mml:attr>
                     <mml:attr name="originalText">Id</mml:attr>
@@ -199,7 +198,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
                     <mml:attr name="value">SAFE</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#datanucleusVersionLong()</mml:attr>
                     <mml:attr name="originalText">Version</mml:attr>
@@ -285,7 +283,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
                     <mml:attr name="value">SAFE</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#datanucleusVersionTimestamp()</mml:attr>
                     <mml:attr name="originalText">Version</mml:attr>
@@ -340,7 +337,6 @@
         </mml:prop>
         <mml:prop id="name">
             <mml:facets>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#name</mml:attr>
                     <mml:attr name="originalText">Name</mml:attr>
@@ -418,7 +414,6 @@
         </mml:prop>
         <mml:prop id="notes">
             <mml:facets>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#notes</mml:attr>
                     <mml:attr name="originalText">Notes</mml:attr>
@@ -538,7 +533,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
                     <mml:attr name="value">NON_IDEMPOTENT_ARE_YOU_SURE</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#delete()</mml:attr>
                     <mml:attr name="originalText">Delete</mml:attr>
@@ -959,7 +953,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
                     <mml:attr name="value">IDEMPOTENT</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#updateName()</mml:attr>
                     <mml:attr name="originalText">Update Name</mml:attr>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
index f73b959..da77db0 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
@@ -88,7 +88,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
                     <mml:attr name="value">NON_IDEMPOTENT</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObjects#create()</mml:attr>
                     <mml:attr name="originalText">Create</mml:attr>
@@ -191,7 +190,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
                     <mml:attr name="value">SAFE</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObjects#findByName()</mml:attr>
                     <mml:attr name="originalText">Find By Name</mml:attr>
@@ -294,7 +292,6 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
                     <mml:attr name="value">SAFE</mml:attr>
                 </mml:facet>
-                <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
                 <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
                     <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObjects#listAll()</mml:attr>
                     <mml:attr name="originalText">List All</mml:attr>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Long.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Long.xml
index 7cc9e79..393bdd4 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Long.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Long.xml
@@ -1,2 +1,64 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="java.lang.Long" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="java.lang.Long" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">Long</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet" fqcn="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetUsingDefaultsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.encodeable.encoder.EncodableFacetUsingEncoderDecoder"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.ImmutableFacetViaValueSemantics">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="when">ALWAYS</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">java.lang.Long</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Longs</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.title.TitleFacet" fqcn="org.apache.isis.core.metamodel.facets.object.title.parser.TitleFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacetViaValueSemantics"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.ValueFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.MaxLengthFacetUsingParser2">
+            <mml:attr name="parser">org.apache.isis.core.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider</mml:attr>
+            <mml:attr name="validating">true</mml:attr>
+            <mml:attr name="value">18</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.TypicalLengthFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.value.longs.LongValueFacet" fqcn="org.apache.isis.core.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider">
+            <mml:attr name="adaptedClass">java.lang.Long</mml:attr>
+            <mml:attr name="defaultValue">0</mml:attr>
+            <mml:attr name="equalByContent">true</mml:attr>
+            <mml:attr name="format">java.text.DecimalFormat@674dc</mml:attr>
+            <mml:attr name="immutable">true</mml:attr>
+            <mml:attr name="maxLength">18</mml:attr>
+            <mml:attr name="typicalLength">18</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Object.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Object.xml
index f3bbfa8..744d569 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Object.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Object.xml
@@ -1,2 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="java.lang.Object" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="java.lang.Object" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">Object</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">java.lang.Object</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Objects</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+    <mml:properties/>
+    <mml:collections/>
+    <mml:actions/>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.String.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.String.xml
index 3941367..9eef4d3 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.String.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.String.xml
@@ -1,2 +1,56 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="java.lang.String" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="java.lang.String" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">String</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet" fqcn="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetUsingDefaultsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.encodeable.encoder.EncodableFacetUsingEncoderDecoder"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.ImmutableFacetViaValueSemantics">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="when">ALWAYS</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">java.lang.String</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Strings</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.title.TitleFacet" fqcn="org.apache.isis.core.metamodel.facets.object.title.parser.TitleFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacetViaValueSemantics"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.ValueFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.TypicalLengthFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.value.string.StringValueFacet" fqcn="org.apache.isis.core.metamodel.facets.value.string.StringValueSemanticsProvider">
+            <mml:attr name="adaptedClass">java.lang.String</mml:attr>
+            <mml:attr name="equalByContent">true</mml:attr>
+            <mml:attr name="immutable">true</mml:attr>
+            <mml:attr name="typicalLength">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.net.URL.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.net.URL.xml
index ff3c71d..58b4943 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.net.URL.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.net.URL.xml
@@ -1,2 +1,62 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="java.net.URL" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="java.net.URL" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">URL</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet" fqcn="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetUsingDefaultsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.encodeable.encoder.EncodableFacetUsingEncoderDecoder"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.ImmutableFacetViaValueSemantics">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="when">ALWAYS</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">java.net.URL</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">URLs</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.title.TitleFacet" fqcn="org.apache.isis.core.metamodel.facets.object.title.parser.TitleFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacetViaValueSemantics"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.ValueFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.MaxLengthFacetUsingParser2">
+            <mml:attr name="parser">org.apache.isis.core.metamodel.facets.value.url.URLValueSemanticsProvider</mml:attr>
+            <mml:attr name="validating">true</mml:attr>
+            <mml:attr name="value">2083</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.TypicalLengthFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.value.url.URLValueFacet" fqcn="org.apache.isis.core.metamodel.facets.value.url.URLValueSemanticsProvider">
+            <mml:attr name="adaptedClass">java.net.URL</mml:attr>
+            <mml:attr name="equalByContent">true</mml:attr>
+            <mml:attr name="immutable">true</mml:attr>
+            <mml:attr name="maxLength">2083</mml:attr>
+            <mml:attr name="typicalLength">100</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.sql.Timestamp.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.sql.Timestamp.xml
index a8df411..7784cd0 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.sql.Timestamp.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.sql.Timestamp.xml
@@ -1,2 +1,53 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="java.sql.Timestamp" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="java.sql.Timestamp" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">Timestamp</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet" fqcn="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetUsingDefaultsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.encodeable.encoder.EncodableFacetUsingEncoderDecoder"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">java.sql.Timestamp</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Timestamps</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.title.TitleFacet" fqcn="org.apache.isis.core.metamodel.facets.object.title.parser.TitleFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.ValueFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.TypicalLengthFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.value.date.DateValueFacet" fqcn="org.apache.isis.core.metamodel.facets.value.timestampsql.JavaSqlTimeStampValueSemanticsProvider">
+            <mml:attr name="adaptedClass">java.sql.Timestamp</mml:attr>
+            <mml:attr name="configuredFormat">short</mml:attr>
+            <mml:attr name="equalByContent">false</mml:attr>
+            <mml:attr name="immutable">false</mml:attr>
+            <mml:attr name="propertyType">timestamp</mml:attr>
+            <mml:attr name="typicalLength">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.List.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.List.xml
index 3db6634..7f5b8e5 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.List.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.List.xml
@@ -1,2 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="java.util.List" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="java.util.List" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet" fqcn="org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject">
+            <mml:attr name="value">java.lang.Object</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">List</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet" fqcn="org.apache.isis.core.metamodel.facets.collections.javautilcollection.JavaCollectionFacet"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">java.util.List</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.parented.ParentedCollectionFacet" fqcn="org.apache.isis.core.metamodel.facets.collections.parented.ParentedCollectionFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Lists</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.Set.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.Set.xml
new file mode 100644
index 0000000..d7212c6
--- /dev/null
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.Set.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<mml:domainClassDto id="java.util.Set" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.annotation.Bulk$InteractionContext.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.annotation.Bulk$InteractionContext.xml
new file mode 100644
index 0000000..49177ce
--- /dev/null
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.annotation.Bulk$InteractionContext.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<mml:domainClassDto id="org.apache.isis.applib.annotation.Bulk$InteractionContext" service="true" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">Interaction Context</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet" fqcn="org.apache.isis.core.metamodel.facets.object.domainservice.annotation.DomainServiceFacetAnnotation">
+            <mml:attr name="natureOfService">DOMAIN</mml:attr>
+            <mml:attr name="repositoryFor">java.lang.Object</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.domainservicelayout.annotation.DomainServiceLayoutFacetAnnotation">
+            <mml:attr name="menuBar">PRIMARY</mml:attr>
+            <mml:attr name="menuOrder">2147483647</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.icon.IconFacet" fqcn="org.apache.isis.core.metamodel.facets.object.domainservice.annotation.IconFacetDerivedFromDomainServiceAnnotation">
+            <mml:attr name="repositoryFor">java.lang.Object</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">org.apache.isis.applib.annotation.Bulk.InteractionContext</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Interaction Contexts</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.services.layout.LayoutService$Style.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.services.layout.LayoutService$Style.xml
index af2c231..670c398 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.services.layout.LayoutService$Style.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.services.layout.LayoutService$Style.xml
@@ -1,2 +1,66 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="org.apache.isis.applib.services.layout.LayoutService$Style" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="org.apache.isis.applib.services.layout.LayoutService$Style" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">Style</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.choices.enums.EnumFacet" fqcn="org.apache.isis.core.metamodel.facets.object.choices.enums.EnumValueSemanticsProvider">
+            <mml:attr name="adaptedClass">org.apache.isis.applib.services.layout.LayoutService.Style</mml:attr>
+            <mml:attr name="defaultValue">CURRENT</mml:attr>
+            <mml:attr name="equalByContent">true</mml:attr>
+            <mml:attr name="immutable">true</mml:attr>
+            <mml:attr name="maxLength">10</mml:attr>
+            <mml:attr name="typicalLength">10</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet" fqcn="org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetUsingDefaultsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.encodeable.encoder.EncodableFacetUsingEncoderDecoder"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.ImmutableFacetViaValueSemantics">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="when">ALWAYS</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">org.apache.isis.applib.services.layout.LayoutService.Style</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Styles</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.title.TitleFacet" fqcn="org.apache.isis.core.metamodel.facets.object.title.parser.TitleFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacetViaValueSemantics"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.ValueFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.choices.enums.ChoicesFacetEnum">
+            <mml:attr name="choices">CURRENT;COMPLETE;NORMALIZED;MINIMAL</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.MaxLengthFacetUsingParser2">
+            <mml:attr name="parser">org.apache.isis.core.metamodel.facets.object.choices.enums.EnumValueSemanticsProvider</mml:attr>
+            <mml:attr name="validating">true</mml:attr>
+            <mml:attr name="value">10</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.TypicalLengthFacetUsingParser"/>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.value.Clob.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.value.Clob.xml
index 9a6da45..7b5f514 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.value.Clob.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.value.Clob.xml
@@ -1,2 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="org.apache.isis.applib.value.Clob" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="org.apache.isis.applib.value.Clob" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">Clob</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.encodeable.encoder.EncodableFacetUsingEncoderDecoder"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.ImmutableFacetViaValueSemantics">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="when">ALWAYS</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">org.apache.isis.applib.value.Clob</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Clobs</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.value.ValueFacet" fqcn="org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProvider"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.value.clobs.ClobValueFacet" fqcn="org.apache.isis.core.metamodel.facets.value.clobs.ClobValueSemanticsProvider">
+            <mml:attr name="adaptedClass">org.apache.isis.applib.value.Clob</mml:attr>
+            <mml:attr name="equalByContent">false</mml:attr>
+            <mml:attr name="immutable">true</mml:attr>
+            <mml:attr name="typicalLength">0</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/void.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/void.xml
index 8e369fe..b6e66d3 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/void.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/void.xml
@@ -1,2 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="void" xmlns:mml="http://isis.apache.org/schema/metamodel"/>
+<mml:domainClassDto id="void" xmlns:mml="http://isis.apache.org/schema/metamodel">
+    <mml:facets>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred">
+            <mml:attr name="escaped">true</mml:attr>
+            <mml:attr name="value">Void</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
+            <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.core.metamodel.facets.object.grid.GridFacetDefault"/>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet" fqcn="org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFallback">
+            <mml:attr name="columns">[4,0,0,8]</mml:attr>
+            <mml:attr name="left">General</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.NotPersistableFacetNull">
+            <mml:attr name="disabling">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">void</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
+            <mml:attr name="validating">true</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.core.metamodel.facets.fallback.PagedFacetFromConfiguration">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">25</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred">
+            <mml:attr name="derived">true</mml:attr>
+            <mml:attr name="value">Voids</mml:attr>
+        </mml:facet>
+        <mml:facet id="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetImpl">
+            <mml:attr name="disabling">true</mml:attr>
+            <mml:attr name="hiding">true</mml:attr>
+        </mml:facet>
+    </mml:facets>
+    <mml:properties/>
+    <mml:collections/>
+    <mml:actions/>
+</mml:domainClassDto>
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
index 573a664..b0a0872 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
@@ -27,7 +27,7 @@ log4j.rootCategory=INFO, Console
 log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.target=System.out
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE}  [%-20c{1} %-10t %-5p]  %m%n
+log4j.appender.Console.layout.ConversionPattern=%-5r %d{ABSOLUTE}  [%-20c{1} %-10t %-5p]  %m%n
 
 
 # The stderr appender
@@ -122,8 +122,8 @@ log4j.additivity.org.apache.isis.core.runtime.threadpool.ThreadPoolSupport=false
 
 # DataNucleus
 # the first two log the DML and DDL (if set to DEBUG)
-log4j.logger.DataNucleus.Datastore.Native=DEBUG, Console, sql-dml
-log4j.logger.DataNucleus.Datastore.Schema=DEBUG, Console, sql-ddl
+log4j.logger.DataNucleus.Datastore.Native=INFO, Console, sql-dml
+log4j.logger.DataNucleus.Datastore.Schema=INFO, Console, sql-ddl
 #log4j.logger.DataNucleus.Datastore.Native=WARN, Console, sql-dml
 #log4j.logger.DataNucleus.Datastore.Schema=WARN, Console, sql-ddl
 # the remainder can probably be left to WARN
@@ -207,6 +207,8 @@ log4j.additivity.DataNucleus.Datastore.IDE=false
 log4j.logger.org.apache.isis.viewer.wicket.viewer.TargetRespondListenerToResetQueryResultCache=DEBUG,Console
 log4j.additivity.org.apache.isis.viewer.wicket.viewer.TargetRespondListenerToResetQueryResultCache=false
 
+log4j.logger.org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract=INFO,Console
+log4j.additivity.org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract=false
 
 
 # quieten some of the noisier classes in Isis' bootstrapping
@@ -242,3 +244,5 @@ log4j.additivity.dom.simple.SimpleObject=false
 # ERROR to suppress the WARNings we get as of 1.15.0
 log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,Console
 log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false
+
+