You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2023/01/18 12:19:19 UTC

[isis] branch 3329-applib.tabledeco created (now 79277e6fd3)

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

ahuber pushed a change to branch 3329-applib.tabledeco
in repository https://gitbox.apache.org/repos/asf/isis.git


      at 79277e6fd3 ISIS-3329: [Applib] Refactor DomainObjectLayout#tableDecoration to allow Customization

This branch includes the following new commits:

     new 79277e6fd3 ISIS-3329: [Applib] Refactor DomainObjectLayout#tableDecoration to allow Customization

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.



[isis] 01/01: ISIS-3329: [Applib] Refactor DomainObjectLayout#tableDecoration to allow Customization

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

ahuber pushed a commit to branch 3329-applib.tabledeco
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 79277e6fd382f179c6dcefd0bf5216f480c9f13f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 18 13:19:10 2023 +0100

    ISIS-3329: [Applib] Refactor DomainObjectLayout#tableDecoration to allow
    Customization
---
 .../applib/annotation/CollectionLayout.java        |   6 +-
 .../applib/annotation/DomainObjectLayout.java      |   7 +-
 .../applib/annotation/TableDecoration.java         |  60 ---
 .../causeway/applib/annotation/TableDecorator.java |  89 ++++
 .../layout/component/CollectionLayoutData.java     |   7 +-
 .../layout/component/DomainObjectLayoutData.java   |   7 +-
 .../core/config/CausewayConfiguration.java         |  53 +--
 .../facets/CollectionLayoutConfigOptions.java      |  39 --
 .../facets/DomainObjectLayoutConfigOptions.java    |  53 ---
 .../PagedFacetForCollectionLayoutAnnotation.java   |   3 +-
 .../CollectionLayoutTableDecorationFacet.java      |  27 +-
 ...llectionLayoutTableDecorationFacetAbstract.java |   8 +-
 ...corationFacetForCollectionLayoutAnnotation.java |   4 +-
 ...tForCollectionLayoutAnnotationAsConfigured.java |   4 +-
 ...TableDecorationFacetForCollectionLayoutXml.java |  22 +-
 ...ayoutTableDecorationFacetFromConfiguration.java |   4 +-
 .../PagedFacetForDomainObjectLayoutAnnotation.java |   3 +-
 .../DomainObjectLayoutTableDecorationFacet.java    |  31 +-
 ...inObjectLayoutTableDecorationFacetAbstract.java |   8 +-
 ...rationFacetForDomainObjectLayoutAnnotation.java |   4 +-
 ...orDomainObjectLayoutAnnotationAsConfigured.java |   4 +-
 ...bleDecorationFacetForDomainObjectLayoutXml.java |  21 +-
 ...ayoutTableDecorationFacetFromConfiguration.java |   4 +-
 .../core/metamodel/spec/feature/ObjectMember.java  |   3 +-
 .../causeway/core/metamodel/util/Facets.java       |  22 +-
 .../DomainObjectLayout/DomainObjectLayoutMenu.java |   8 +
 .../plural/DomainObjectLayoutPluralVm.java         |   2 -
 ...inObjectLayoutTableDecoratorVm-description.adoc |   4 +
 .../DomainObjectLayoutTableDecoratorVm.java}       |  35 +-
 .../DomainObjectLayoutTableDecoratorVm.layout.xml  |  49 +++
 .../src/main/java/demoapp/dom/menubars.layout.xml  |   1 +
 .../MetaModelRegressionTest.verify.approved.xml    | 458 ++++++++++-----------
 .../entity/collection/EntityCollectionPanel.java   |  31 +-
 .../StandaloneCollectionPanel.java                 |  31 +-
 .../viewer/wicket/ui/pages/PageAbstract.java       |  11 -
 .../DatatablesJavaScriptResourceReferenceInit.java |  77 ----
 .../common/datatables/dataTables.init.js.template  |  28 --
 .../viewer/wicket/ui/panels/PanelAbstract.java     |  28 ++
 .../apache/causeway/viewer/wicket/ui/util/Wkt.java |   6 +
 39 files changed, 590 insertions(+), 672 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/CollectionLayout.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/CollectionLayout.java
index ac91068825..9e498049e4 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/CollectionLayout.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/CollectionLayout.java
@@ -172,8 +172,8 @@ public @interface CollectionLayout {
      * Whether a parented collection when represented in a table form should additionally be
      * &quot;decorated&quot; with client-side (javascript) enhancements, for example to enable paging and filtering.
      */
-    TableDecoration tableDecoration()
-            default TableDecoration.NOT_SPECIFIED;
-
+    Class<? extends TableDecorator>
+        tableDecorator()
+        default TableDecorator.Default.class;
 
 }
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObjectLayout.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObjectLayout.java
index eedbd0e8f8..8b21350af0 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObjectLayout.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObjectLayout.java
@@ -141,11 +141,12 @@ public @interface DomainObjectLayout {
             default "";
 
     /**
-     * Whether a standalone collection when represented in a table form should additionally be
+     * Whether a standalone collection, when represented in a table form, should additionally be
      * &quot;decorated&quot; with client-side (javascript) enhancements, for example to enable paging and filtering.
      */
-    TableDecoration tableDecoration()
-            default TableDecoration.NOT_SPECIFIED;
+    Class<? extends TableDecorator>
+        tableDecorator()
+        default TableDecorator.Default.class;
 
 
     /**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/TableDecoration.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/TableDecoration.java
deleted file mode 100644
index bbcbf52ddd..0000000000
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/TableDecoration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  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.causeway.applib.annotation;
-
-/**
- * The options for defining how a parented or standalone collection when represented in a table form should additionally
- * be &quot;decorated&quot; with client-side (javascript) enhancements.
- *
- * <p>
- *     This is supported by the Wicket viewer, the principle use case being to enable <a href="https://datatables.net>datatables.net</a>
- *     to be used for client-side paging and filtering.
- * </p>
- *
- * @since 1.x {@index}
- */
-public enum TableDecoration {
-
-    /**
-     * The collection's table representation should be decorated, if at all, as configured in <tt>application.properties</tt>.
-     *
-     * <p>
-     *     If there is no configuration, then default to use {@link TableDecoration#NONE no} decoration.
-     * </p>
-     */
-    AS_CONFIGURED,
-
-    /**
-     * If this option declares that the collection's table representation should not be decorated.
-     */
-    NONE,
-
-    /**
-     * If this option declares that the collection's table representation be decorated using
-     * <a href="https://datatables.net>datatables.net</a> for client-side paging and filtering.
-     */
-    DATATABLES_NET,
-
-    /**
-     * Ignore the value provided by this annotation (meaning that the framework will keep searching, in meta
-     * annotations or superclasses/interfaces).
-     */
-    NOT_SPECIFIED
-
-}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/TableDecorator.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/TableDecorator.java
new file mode 100644
index 0000000000..480d997f49
--- /dev/null
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/TableDecorator.java
@@ -0,0 +1,89 @@
+/*
+ *  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.causeway.applib.annotation;
+
+public interface TableDecorator {
+
+    public default String cssClass() {
+        return null;
+    }
+
+    public default String documentReadyJavaScript() {
+        return null;
+    }
+
+    // -- BUILT-IN IMPLEMENTATIONS
+
+    /**
+     * The collection's table representation is NOT decorated.
+     */
+    public class Default implements TableDecorator {
+    }
+
+    /**
+     * The collection's table representation is decorated using
+     * <a href="https://datatables.net>datatables.net</a>
+     * for client-side paging and filtering.
+     * <p>
+     * Use subclasses for custom options.
+     */
+    public class DatatablesNet implements TableDecorator {
+
+        @Override
+        public String cssClass() {
+            return "table-decoration-dn-default";
+        }
+
+        /**
+         * If specified, then the string is passed verbatim as the initialization options for the
+         * <a href="https://datatables.net">https://datatables.net</a> table decoration
+         * (as defined by {@link DomainObjectLayout#tableDecorator()} or by
+         * {@link CollectionLayout#tableDecorator()}).
+         *
+         * <p>
+         *     For example, a value of "info: false, pagingType: 'numbers'" will result in
+         *     datatables.net being initialized using:
+         *
+         *     <pre>
+         *     $(document).ready(function () {
+         *       $('table.table-decoration').DataTable({
+         *         info: false, pagingType: 'numbers'
+         *       });
+         *     });
+         *     </pre>
+         *     thus switching off the info panel and using the simple 'numbers' paging type.
+         * </p>
+         *
+         * @see <a href="https://datatables.net/examples/basic_init/index.html">https://datatables.net/examples/basic_init/index.html</a>
+         */
+        public String getOpts() {
+            return "";
+        }
+
+        @Override
+        public String documentReadyJavaScript() {
+            return
+                "$('div." + cssClass() + " table.contents').DataTable({"
+                + getOpts()
+                + "});";
+        }
+
+    }
+
+}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java
index a612abcfd3..4b5ad202fc 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.layout.links.Link;
 
@@ -188,14 +189,14 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
 
 
 
-    private TableDecoration tableDecoration;
+    private Class<? extends TableDecorator> tableDecoration;
 
     @XmlElement(required = false)
-    public TableDecoration getTableDecoration() {
+    public Class<? extends TableDecorator> getTableDecoration() {
         return tableDecoration;
     }
 
-    public void setTableDecoration(final TableDecoration tableDecoration) {
+    public void setTableDecoration(final Class<? extends TableDecorator> tableDecoration) {
         this.tableDecoration = tableDecoration;
     }
 
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java
index 1a0bd630f2..22d06010f4 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.BookmarkPolicy;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.applib.layout.links.Link;
 
 /**
@@ -162,14 +163,14 @@ HasBookmarking, HasCssClass, HasCssClassFa, HasDescribedAs, HasNamed {
 
 
 
-    private TableDecoration tableDecoration;
+    private Class<? extends TableDecorator> tableDecoration;
 
     @XmlElement(required = false)
-    public TableDecoration getTableDecoration() {
+    public Class<? extends TableDecorator> getTableDecoration() {
         return tableDecoration;
     }
 
-    public void setTableDecoration(final TableDecoration tableDecoration) {
+    public void setTableDecoration(final Class<? extends TableDecorator> tableDecoration) {
         this.tableDecoration = tableDecoration;
     }
 
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index 499dd750a2..406b9ec2ef 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -59,11 +59,10 @@ import org.springframework.validation.annotation.Validated;
 
 import org.apache.causeway.applib.CausewayModuleApplib;
 import org.apache.causeway.applib.annotation.ActionLayout;
-import org.apache.causeway.applib.annotation.CollectionLayout;
-import org.apache.causeway.applib.annotation.DomainObjectLayout;
 import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.applib.services.i18n.Mode;
 import org.apache.causeway.applib.services.iactn.Execution;
 import org.apache.causeway.applib.services.publishing.spi.EntityChangesSubscriber;
@@ -74,10 +73,11 @@ import org.apache.causeway.applib.services.userui.UserMenu;
 import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
 import org.apache.causeway.commons.internal.base._NullSafe;
 import org.apache.causeway.commons.internal.context._Context;
+import org.apache.causeway.core.config.CausewayConfiguration.Core;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer;
 import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
 import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
 import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
-import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
 import org.apache.causeway.core.config.metamodel.facets.ParameterConfigOptions;
 import org.apache.causeway.core.config.metamodel.facets.PropertyConfigOptions;
 import org.apache.causeway.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
@@ -570,7 +570,7 @@ public class CausewayConfiguration {
                  * Defines whether the table representation of a standalone collection of this domain class should be
                  * decorated using a client-side Javascript library, eg for client-side paging and filtering.
                  */
-                private DomainObjectLayoutConfigOptions.TableDecoration tableDecoration = DomainObjectLayoutConfigOptions.TableDecoration.NONE;
+                private Class<? extends TableDecorator> tableDecoration = TableDecorator.Default.class;
 
                 private final CssClassUiEvent cssClassUiEvent = new CssClassUiEvent();
                 @Data
@@ -1102,7 +1102,7 @@ public class CausewayConfiguration {
                  * Defines whether the table representation of a collection should be decorated using a client-side
                  * Javascript library, eg for client-side paging and filtering.
                  */
-                private CollectionLayoutConfigOptions.TableDecoration tableDecoration = CollectionLayoutConfigOptions.TableDecoration.NONE;
+                private Class<? extends TableDecorator> tableDecorator = TableDecorator.Default.class;
 
             }
 
@@ -2653,49 +2653,6 @@ public class CausewayConfiguration {
                 }
             }
 
-            private final Table table = new Table();
-            @Data
-            public static class Table {
-
-                private final Decoration decoration = new Decoration();
-                @Data
-                public static class Decoration {
-
-                    private final DataTablesNet dataTablesNet = new DataTablesNet();
-                    @Data
-                    public static class DataTablesNet {
-
-                        /**
-                         * If specified, then the string is passed verbatim as the initialization options for the
-                         * <a href="https://datatables.net">https://datatables.net</a> table decoration
-                         * (as defined by {@link DomainObjectLayout#tableDecoration()} or by
-                         * {@link CollectionLayout#tableDecoration()}).
-                         *
-                         * <p>
-                         *     For example, a value of "info: false, pagingType: 'numbers'" will result in
-                         *     datatables.net being initialized using:
-                         *
-                         *     <pre>
-                         *     $(document).ready(function () {
-                         *       $('table.table-decoration').DataTable({
-                         *         info: false, pagingType: 'numbers'
-                         *       });
-                         *     });
-                         *     </pre>
-                         *     thus switching off the info panel and using the simple 'numbers' paging type.
-                         * </p>
-                         *
-                         * @see <a href="https://datatables.net/examples/basic_init/index.html">https://datatables.net/examples/basic_init/index.html</a>
-                         */
-                        private Optional<String> options = Optional.empty();
-
-                    }
-
-                }
-
-
-            }
-
         }
     }
 
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
index d1bec7d8f2..533d9ee6a3 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
@@ -18,49 +18,10 @@
  */
 package org.apache.causeway.core.config.metamodel.facets;
 
-import org.springframework.lang.Nullable;
-
 import org.apache.causeway.core.config.CausewayConfiguration;
 
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.experimental.Accessors;
-
 public final class CollectionLayoutConfigOptions {
 
-    //@RequiredArgsConstructor XXX[ISIS-3287] don't use lombok here: hibernate-validation bug
-    public enum TableDecoration {
-
-        /**
-         * If this option declares that the collection's table representation should not be decorated.
-         */
-        NONE(null),
-
-        /**
-         * If this option declares that the collection's table representation be decorated using
-         * <a href="https://datatables.net>datatables.net</a> for client-side paging and filtering.
-         */
-        DATATABLES_NET("table-decoration");
-
-        @Getter @Accessors(fluent = true)
-        private final @Nullable String cssClass;
-
-        public boolean isNone() { return this == NONE; }
-        public boolean isDataTablesNet() { return this == DATATABLES_NET; }
-
-        private TableDecoration(final String cssClass) {
-            this.cssClass = cssClass;
-        }
-    }
-
-    // -- FACTORIES
-
-    public static TableDecoration tableDecoration(
-            final @NonNull CausewayConfiguration configuration) {
-        return configuration.getApplib().getAnnotation().getCollectionLayout().getTableDecoration();
-    }
-
-
     public enum DefaultView {
         HIDDEN(),
         TABLE();
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectLayoutConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectLayoutConfigOptions.java
deleted file mode 100644
index 7c9501ac12..0000000000
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectLayoutConfigOptions.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  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.causeway.core.config.metamodel.facets;
-
-import org.apache.causeway.core.config.CausewayConfiguration;
-
-import lombok.NonNull;
-
-public final class DomainObjectLayoutConfigOptions {
-
-    public enum TableDecoration {
-
-        /**
-         * If this option declares that the collection's table representation should not be decorated.
-         */
-        NONE,
-
-        /**
-         * If this option declares that the collection's table representation be decorated using
-         * <a href="https://datatables.net>datatables.net</a> for client-side paging and filtering.
-         */
-        DATATABLES_NET;
-
-        public boolean isNone() { return this == NONE; }
-        public boolean isDataTablesNet() { return this == DATATABLES_NET; }
-
-    }
-
-
-    public static DomainObjectLayoutConfigOptions.TableDecoration tableDecoration(
-            final @NonNull CausewayConfiguration configuration) {
-        return configuration.getApplib().getAnnotation().getDomainObjectLayout().getTableDecoration();
-    }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
index 29ba2c50a0..edac1693d1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
 import java.util.Optional;
 
 import org.apache.causeway.applib.annotation.CollectionLayout;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet;
 import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacet;
@@ -35,7 +36,7 @@ public class PagedFacetForCollectionLayoutAnnotation extends PagedFacetAbstract
             final FacetHolder holder) {
 
         val tableDecorationFacet = holder.getFacet(CollectionLayoutTableDecorationFacet.class);
-        if (tableDecorationFacet.value().isDataTablesNet()) {
+        if (TableDecorator.DatatablesNet.class.equals(tableDecorationFacet.value())) {
             return Optional.of(new PagedFacetOverriddenByDataTablesDecoration(holder));
         }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java
index a82cd41e20..45a5bf3d88 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java
@@ -23,8 +23,8 @@ import java.util.Optional;
 
 import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.commons.internal.base._Optionals;
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facets.SingleValueFacet;
 
@@ -37,36 +37,23 @@ import org.apache.causeway.core.metamodel.facets.SingleValueFacet;
  * @since 2.0
  */
 public interface CollectionLayoutTableDecorationFacet
-extends SingleValueFacet<CollectionLayoutConfigOptions.TableDecoration> {
+extends SingleValueFacet<Class<? extends TableDecorator>> {
 
     static Optional<CollectionLayoutTableDecorationFacet> create(
             final Optional<CollectionLayout> collectionLayoutIfAny,
             final FacetHolder holder) {
 
-        final CollectionLayoutConfigOptions.TableDecoration defaultPolicyFromConfig =
-                CollectionLayoutConfigOptions.tableDecoration(holder.getConfiguration());
-
         return _Optionals.orNullable(
 
         collectionLayoutIfAny
-        .map(CollectionLayout::tableDecoration)
-        .<CollectionLayoutTableDecorationFacet>map(tableDecoration -> {
-            switch (tableDecoration) {
-            case NONE:
-                return new CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation(
-                        CollectionLayoutConfigOptions.TableDecoration.NONE, holder);
-            case DATATABLES_NET:
+        .map(CollectionLayout::tableDecorator)
+        .<CollectionLayoutTableDecorationFacet>map(tableDecorator -> {
                 return new CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation(
-                        CollectionLayoutConfigOptions.TableDecoration.DATATABLES_NET, holder);
-            case NOT_SPECIFIED:
-            case AS_CONFIGURED:
-                return new CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation(defaultPolicyFromConfig, holder);
-            default:
-            }
-            throw new IllegalStateException("tableDecoration '" + tableDecoration + "' not recognised");
+                        tableDecorator, holder);
         })
         ,
-        () -> new CollectionLayoutTableDecorationFacetFromConfiguration(defaultPolicyFromConfig, holder));
+        () -> new CollectionLayoutTableDecorationFacetFromConfiguration(
+                holder.getConfiguration().getApplib().getAnnotation().getCollectionLayout().getTableDecorator(), holder));
 
     }
 }
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetAbstract.java
index c678732ebc..bdea16bc89 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetAbstract.java
@@ -19,13 +19,13 @@
  */
 package org.apache.causeway.core.metamodel.facets.collections.layout.tabledec;
 
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.Facet;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facets.SingleValueFacetAbstract;
 
 abstract class CollectionLayoutTableDecorationFacetAbstract
-extends SingleValueFacetAbstract<CollectionLayoutConfigOptions.TableDecoration>
+extends SingleValueFacetAbstract<Class<? extends TableDecorator>>
 implements CollectionLayoutTableDecorationFacet {
 
     private static final Class<? extends Facet> type() {
@@ -33,13 +33,13 @@ implements CollectionLayoutTableDecorationFacet {
     }
 
     protected CollectionLayoutTableDecorationFacetAbstract(
-            final CollectionLayoutConfigOptions.TableDecoration value, final FacetHolder holder,
+            final Class<? extends TableDecorator> value, final FacetHolder holder,
             final Precedence precedence) {
         super(type(), value, holder, precedence);
     }
 
     protected CollectionLayoutTableDecorationFacetAbstract(
-            final CollectionLayoutConfigOptions.TableDecoration value, final FacetHolder holder) {
+            final Class<? extends TableDecorator> value, final FacetHolder holder) {
         super(type(), value, holder);
     }
 }
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation.java
index 5c4ed0f523..293dd5675b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation.java
@@ -19,14 +19,14 @@
  */
 package org.apache.causeway.core.metamodel.facets.collections.layout.tabledec;
 
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 
 public class CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation
 extends CollectionLayoutTableDecorationFacetAbstract {
 
     CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation(
-            final CollectionLayoutConfigOptions.TableDecoration value, final FacetHolder holder) {
+            final Class<? extends TableDecorator> value, final FacetHolder holder) {
         super(value, holder);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotationAsConfigured.java
index 3d9443e99a..888e8bc8bd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotationAsConfigured.java
@@ -19,14 +19,14 @@
  */
 package org.apache.causeway.core.metamodel.facets.collections.layout.tabledec;
 
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 
 public class CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotationAsConfigured
 extends CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation {
 
     CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotationAsConfigured(
-            final CollectionLayoutConfigOptions.TableDecoration value, final FacetHolder holder) {
+            final Class<? extends TableDecorator> value, final FacetHolder holder) {
         super(value, holder);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java
index b042ac4376..d4fe69eee0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout.tabledec;
 
 import java.util.Optional;
 
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.applib.layout.component.CollectionLayoutData;
-import org.apache.causeway.applib.layout.component.TableDecoration;
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 
 public class CollectionLayoutTableDecorationFacetForCollectionLayoutXml
@@ -36,19 +35,18 @@ extends CollectionLayoutTableDecorationFacetAbstract {
             final CollectionLayoutData collectionLayout,
             final FacetHolder holder,
             final Precedence precedence) {
-        if (collectionLayout == null) {
-            return Optional.empty();
-        }
-
-        final TableDecoration tableDecoration = collectionLayout.getTableDecoration();
-        return tableDecoration == TableDecoration.DATATABLES_NET
-                ? Optional.of(new CollectionLayoutTableDecorationFacetForCollectionLayoutXml(holder, precedence))
-                : Optional.empty();
+
+        return Optional.ofNullable(collectionLayout)
+        .map(CollectionLayoutData::getTableDecoration)
+        .map(tableDecoration->
+            new CollectionLayoutTableDecorationFacetForCollectionLayoutXml(tableDecoration, holder, precedence));
     }
 
     private CollectionLayoutTableDecorationFacetForCollectionLayoutXml(
-            final FacetHolder holder, final Precedence precedence) {
-        super(CollectionLayoutConfigOptions.TableDecoration.DATATABLES_NET, holder, precedence);
+            final Class<? extends TableDecorator> value,
+            final FacetHolder holder,
+            final Precedence precedence) {
+        super(value, holder, precedence);
     }
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetFromConfiguration.java
index a99fa58d9f..b9bb6eae99 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetFromConfiguration.java
@@ -19,14 +19,14 @@
  */
 package org.apache.causeway.core.metamodel.facets.collections.layout.tabledec;
 
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 
 public class CollectionLayoutTableDecorationFacetFromConfiguration
 extends CollectionLayoutTableDecorationFacetAbstract {
 
     CollectionLayoutTableDecorationFacetFromConfiguration(
-            final CollectionLayoutConfigOptions.TableDecoration value, final FacetHolder holder) {
+            final Class<? extends TableDecorator> value, final FacetHolder holder) {
         super(value, holder);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
index 8e1c093186..8e4b8ea8bb 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
 import java.util.Optional;
 
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet;
 import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacet;
@@ -36,7 +37,7 @@ public class PagedFacetForDomainObjectLayoutAnnotation extends PagedFacetAbstrac
 
 
         val tableDecorationFacet = holder.getFacet(DomainObjectLayoutTableDecorationFacet.class);
-        if (tableDecorationFacet.value().isDataTablesNet()) {
+        if (TableDecorator.DatatablesNet.class.equals(tableDecorationFacet.value())) {
             return Optional.of(new PagedFacetOverriddenByDataTablesDecoration(holder));
         }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java
index ab24eba368..2b60a15423 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java
@@ -23,8 +23,8 @@ import java.util.Optional;
 
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
 import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.commons.internal.base._Optionals;
-import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facets.SingleValueFacet;
 
@@ -37,35 +37,22 @@ import org.apache.causeway.core.metamodel.facets.SingleValueFacet;
  * @since 2.0
  */
 public interface DomainObjectLayoutTableDecorationFacet
-extends SingleValueFacet<DomainObjectLayoutConfigOptions.TableDecoration> {
+extends SingleValueFacet<Class<? extends TableDecorator>> {
 
     static Optional<DomainObjectLayoutTableDecorationFacet> create(
             final Optional<DomainObjectLayout> domainObjectLayoutIfAny,
             final FacetHolder holder) {
 
-        final DomainObjectLayoutConfigOptions.TableDecoration defaultPolicyFromConfig =
-                DomainObjectLayoutConfigOptions.tableDecoration(holder.getConfiguration());
-
         return _Optionals.orNullable(
 
         domainObjectLayoutIfAny
-        .map(DomainObjectLayout::tableDecoration)
-        .<DomainObjectLayoutTableDecorationFacet>map(tableDecoration -> {
-            switch (tableDecoration) {
-            case NONE:
-                return new DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation(
-                        DomainObjectLayoutConfigOptions.TableDecoration.NONE, holder);
-            case DATATABLES_NET:
-                return new DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation(
-                        DomainObjectLayoutConfigOptions.TableDecoration.DATATABLES_NET, holder);
-            case NOT_SPECIFIED:
-            case AS_CONFIGURED:
-                return new DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation(defaultPolicyFromConfig, holder);
-            default:
-            }
-            throw new IllegalStateException("tableDecoration '" + tableDecoration + "' not recognised");
-        })
+        .map(DomainObjectLayout::tableDecorator)
+        .<DomainObjectLayoutTableDecorationFacet>map(tableDecorator ->
+                new DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation(
+                        tableDecorator, holder))
         ,
-        () -> new DomainObjectLayoutTableDecorationFacetFromConfiguration(defaultPolicyFromConfig, holder));
+        () -> new DomainObjectLayoutTableDecorationFacetFromConfiguration(
+                holder.getConfiguration().getApplib().getAnnotation().getDomainObjectLayout().getTableDecoration(),
+                holder));
     }
 }
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetAbstract.java
index 9328e6d6bb..0fc64075f9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetAbstract.java
@@ -19,13 +19,13 @@
  */
 package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec;
 
-import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.Facet;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facets.SingleValueFacetAbstract;
 
 abstract class DomainObjectLayoutTableDecorationFacetAbstract
-extends SingleValueFacetAbstract<DomainObjectLayoutConfigOptions.TableDecoration>
+extends SingleValueFacetAbstract<Class<? extends TableDecorator>>
 implements DomainObjectLayoutTableDecorationFacet {
 
     private static final Class<? extends Facet> type() {
@@ -33,14 +33,14 @@ implements DomainObjectLayoutTableDecorationFacet {
     }
 
     protected DomainObjectLayoutTableDecorationFacetAbstract(
-            final DomainObjectLayoutConfigOptions.TableDecoration value,
+            final Class<? extends TableDecorator> value,
             final FacetHolder holder,
             final Facet.Precedence precedence) {
         super(type(), value, holder, precedence);
     }
 
     protected DomainObjectLayoutTableDecorationFacetAbstract(
-            final DomainObjectLayoutConfigOptions.TableDecoration value,
+            final Class<? extends TableDecorator> value,
             final FacetHolder holder) {
         super(type(), value, holder);
     }
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation.java
index 5c2d2c1773..2649e23754 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation.java
@@ -19,14 +19,14 @@
  */
 package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec;
 
-import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 
 public class DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation
 extends DomainObjectLayoutTableDecorationFacetAbstract {
 
     DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation(
-            final DomainObjectLayoutConfigOptions.TableDecoration value, final FacetHolder holder) {
+            final Class<? extends TableDecorator> value, final FacetHolder holder) {
         super(value, holder);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotationAsConfigured.java
index d058b64953..f0d5371b54 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotationAsConfigured.java
@@ -19,14 +19,14 @@
  */
 package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec;
 
-import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 
 public class DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotationAsConfigured
 extends DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation {
 
     DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotationAsConfigured(
-            final DomainObjectLayoutConfigOptions.TableDecoration value, final FacetHolder holder) {
+            final Class<? extends TableDecorator> value, final FacetHolder holder) {
         super(value, holder);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java
index e4f4413ca7..86d3490910 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java
@@ -20,14 +20,11 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabl
 
 import java.util.Optional;
 
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
-import org.apache.causeway.applib.layout.component.TableDecoration;
-import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
 import org.apache.causeway.core.metamodel.facetapi.Facet;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 
-import lombok.val;
-
 public class DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml
 extends DomainObjectLayoutTableDecorationFacetAbstract {
 
@@ -40,21 +37,17 @@ extends DomainObjectLayoutTableDecorationFacetAbstract {
             final FacetHolder holder,
             final Facet.Precedence precedence) {
 
-        if(domainObjectLayout == null) {
-            return Optional.empty();
-        }
-
-        val tableDecoration = domainObjectLayout.getTableDecoration();
-        return Optional.ofNullable(
-                tableDecoration == TableDecoration.DATATABLES_NET ?
-                    new DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml(holder, precedence)
-                    : null);
+        return Optional.ofNullable(domainObjectLayout)
+        .map(DomainObjectLayoutData::getTableDecoration)
+        .map(tableDecoration->
+            new DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml(tableDecoration, holder, precedence));
     }
 
     private DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml(
+            final Class<? extends TableDecorator> value,
             final FacetHolder holder,
             final Facet.Precedence precedence) {
-        super(DomainObjectLayoutConfigOptions.TableDecoration.DATATABLES_NET, holder, precedence);
+        super(value, holder, precedence);
     }
 
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetFromConfiguration.java
index 3900baccde..e3016dd711 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetFromConfiguration.java
@@ -19,14 +19,14 @@
  */
 package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec;
 
-import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 
 public class DomainObjectLayoutTableDecorationFacetFromConfiguration
 extends DomainObjectLayoutTableDecorationFacetAbstract {
 
     DomainObjectLayoutTableDecorationFacetFromConfiguration(
-            final DomainObjectLayoutConfigOptions.TableDecoration value, final FacetHolder holder) {
+            final Class<? extends TableDecorator> value, final FacetHolder holder) {
         super(value, holder);
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectMember.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectMember.java
index b0f9903f88..cd35e242a6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectMember.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectMember.java
@@ -27,6 +27,7 @@ import java.util.stream.Stream;
 
 import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal._Constants;
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.base._NullSafe;
 import org.apache.causeway.commons.internal.base._Strings;
@@ -279,7 +280,7 @@ public interface ObjectMember extends ObjectFeature {
         }
 
         val pojoComparator = _Casts.<Comparator<Object>>uncheckedCast(
-                _InstanceUtil.createInstance(sortedBy));
+                _InstanceUtil.createInstance(sortedBy, _Constants.emptyObjects));
         getMetaModelContext().getServiceInjector().injectServicesInto(pojoComparator);
 
         return Optional.of((a, b) -> pojoComparator.compare(a.getPojo(), b.getPojo()));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java
index 7d81013a04..591e4892f7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java
@@ -30,15 +30,17 @@ import org.apache.causeway.applib.annotation.BookmarkPolicy;
 import org.apache.causeway.applib.annotation.DomainServiceLayout.MenuBar;
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.id.LogicalType;
 import org.apache.causeway.applib.layout.grid.bootstrap.BSGrid;
 import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
 import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal._Constants;
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.base._NullSafe;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
 import org.apache.causeway.core.config.metamodel.facets.ParameterConfigOptions;
 import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.causeway.core.metamodel.facetapi.Facet;
@@ -51,6 +53,7 @@ import org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.Col
 import org.apache.causeway.core.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.causeway.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
 import org.apache.causeway.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
+import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet;
 import org.apache.causeway.core.metamodel.facets.object.domainservice.DomainServiceFacet;
 import org.apache.causeway.core.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacet;
 import org.apache.causeway.core.metamodel.facets.object.grid.GridFacet;
@@ -328,12 +331,27 @@ public final class Facets {
         .orElse(fallback);
     }
 
-    public Optional<CollectionLayoutConfigOptions.TableDecoration> tableDecoration(
+    public Optional<TableDecorator> tableDecoration(
+            final FacetHolder facetHolder) {
+        return parentedTableDecoration(facetHolder)
+                .or(()->standaloneTableDecoration(facetHolder))
+                .map(decoratorClass->
+                    facetHolder.injectServicesInto(
+                            _InstanceUtil.createInstance(decoratorClass, decoratorClass, _Constants.emptyObjects)));
+    }
+
+    private Optional<Class<? extends TableDecorator>> parentedTableDecoration(
             final FacetHolder facetHolder) {
         return facetHolder.lookupFacet(CollectionLayoutTableDecorationFacet.class)
                 .map(CollectionLayoutTableDecorationFacet::value);
     }
 
+    private Optional<Class<? extends TableDecorator>> standaloneTableDecoration(
+            final FacetHolder facetHolder) {
+        return facetHolder.lookupFacet(DomainObjectLayoutTableDecorationFacet.class)
+                .map(DomainObjectLayoutTableDecorationFacet::value);
+    }
+
     public Optional<ObjectSpecification> elementSpec(final FacetHolder facetHolder) {
         return facetHolder.lookupFacet(TypeOfFacet.class)
         .map(TypeOfFacet::elementSpec);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
index d181b087d0..5db65713c1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
@@ -37,6 +37,7 @@ import demoapp.dom.domain.objects.DomainObjectLayout.describedAs.DomainObjectLay
 import demoapp.dom.domain.objects.DomainObjectLayout.named.DomainObjectLayoutNamedVm;
 import demoapp.dom.domain.objects.DomainObjectLayout.paged.DomainObjectLayoutPagedVm;
 import demoapp.dom.domain.objects.DomainObjectLayout.plural.DomainObjectLayoutPluralVm;
+import demoapp.dom.domain.objects.DomainObjectLayout.tabledec.DomainObjectLayoutTableDecoratorVm;
 import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.DomainObjectLayoutXxxUiEventVm;
 
 @Named("demo.DomainObjectLayoutMenu")
@@ -98,6 +99,13 @@ public class DomainObjectLayoutMenu {
         return factoryService.viewModel(new DomainObjectLayoutPluralVm());
     }
 
+    @Action(semantics = SemanticsOf.SAFE)
+    @ActionLayout(cssClassFa="fa-solid fa-table-columns",
+        describedAs = "Allows to specify a custom client side table renderer.")
+    public DomainObjectLayoutTableDecoratorVm tableDecorator(){
+        return factoryService.viewModel(new DomainObjectLayoutTableDecoratorVm());
+    }
+
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-desktop",
         describedAs = "Class of the UI events emitted to allow subscribers to specify title, icon etc")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java
index 8a7861fb68..8a0709b9eb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java
@@ -35,7 +35,6 @@ import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.TableDecoration;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import lombok.Getter;
@@ -49,7 +48,6 @@ import lombok.Setter;
 @DomainObject(
         nature=Nature.VIEW_MODEL)
 @DomainObjectLayout(
-        tableDecoration = TableDecoration.DATATABLES_NET,
         plural="Example Plural Name")
 public class DomainObjectLayoutPluralVm implements HasAsciiDocDescription {
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm-description.adoc
new file mode 100644
index 0000000000..82f14ee735
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm-description.adoc
@@ -0,0 +1,4 @@
+:Notice: 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 ag [...]
+
+The `tableDecorator` attribute allows to specify a custom client side table renderer.
+
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm.java
similarity index 63%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm.java
index 8a7861fb68..9070366277 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.objects.DomainObjectLayout.plural;
+package demoapp.dom.domain.objects.DomainObjectLayout.tabledec;
 
 import java.util.List;
 import java.util.UUID;
@@ -29,13 +29,15 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.Collection;
+import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.TableDecoration;
+import org.apache.causeway.applib.annotation.TableDecorator;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import lombok.Getter;
@@ -45,23 +47,34 @@ import lombok.Setter;
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.DomainObjectLayoutPluralVm")
+@Named("demo.DomainObjectLayoutTableDecoratorVm")
 @DomainObject(
         nature=Nature.VIEW_MODEL)
 @DomainObjectLayout(
-        tableDecoration = TableDecoration.DATATABLES_NET,
-        plural="Example Plural Name")
-public class DomainObjectLayoutPluralVm implements HasAsciiDocDescription {
+        tableDecorator = TableDecorator.DatatablesNet.class)
+public class DomainObjectLayoutTableDecoratorVm implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObjectLayout#plural";
+        return "DomainObjectLayout#tableDecorator";
     }
 
     @Action
-    public List<DomainObjectLayoutPluralVm> standaloneTable() {
-        return List.of(
-                    new DomainObjectLayoutPluralVm(),
-                    new DomainObjectLayoutPluralVm());
+    public List<DomainObjectLayoutTableDecoratorVm> standaloneTable() {
+        return getSamples();
+    }
+
+    @Collection
+    @CollectionLayout(tableDecorator = TableDecorator.DatatablesNet.class)
+    private List<DomainObjectLayoutTableDecoratorVm> samples;
+    public List<DomainObjectLayoutTableDecoratorVm> getSamples() {
+        if(samples==null) {
+            samples = List.of(
+                    new DomainObjectLayoutTableDecoratorVm(),
+                    new DomainObjectLayoutTableDecoratorVm(),
+                    new DomainObjectLayoutTableDecoratorVm(),
+                    new DomainObjectLayoutTableDecoratorVm());
+        }
+        return samples;
     }
 
     @Property(optionality = Optionality.OPTIONAL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm.layout.xml
new file mode 100644
index 0000000000..875e9c68b8
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm.layout.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- 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. -->
+<bs3:grid
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+	<bs3:row>
+		<bs3:col span="10" unreferencedActions="true">
+			<cpt:domainObject />
+		</bs3:col>
+		<bs3:col span="2">
+			<cpt:fieldSet name="" id="sources" />
+		</bs3:col>
+	</bs3:row>
+
+	<bs3:row>
+		<bs3:col span="6">
+			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+		</bs3:col>
+		<bs3:col span="6">
+			<cpt:fieldSet name="Description" id="description" >
+				<cpt:action id="clearHints" position="PANEL" />
+				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
+				<cpt:action id="rebuildMetamodel" position="PANEL"/>
+				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
+				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
+                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
+				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
+				<cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
+				<cpt:property id="description"/>
+			</cpt:fieldSet>
+		</bs3:col>
+	</bs3:row>
+	<bs3:row>
+		<bs3:col span="12" unreferencedCollections="true"/>
+	</bs3:row>
+
+</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
index 72ae7c222a..5bf6971c5c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
@@ -46,6 +46,7 @@ For latest we use: https://raw.githubusercontent.com/apache/causeway/master/anto
                 <mb3:serviceAction objectType="demo.DomainObjectLayoutMenu" id="named"/>
                 <mb3:serviceAction objectType="demo.DomainObjectLayoutMenu" id="paged"/>
                 <mb3:serviceAction objectType="demo.DomainObjectLayoutMenu" id="plural"/>
+                <mb3:serviceAction objectType="demo.DomainObjectLayoutMenu" id="tableDecorator"/>
                 <mb3:serviceAction objectType="demo.DomainObjectLayoutMenu" id="xxxUiEvent"/>
             </mb3:section>
             <mb3:section>
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml
index e73876a0d8..de82550bba 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml
@@ -47,7 +47,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -139,7 +139,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -250,7 +250,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -446,7 +446,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -579,7 +579,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -676,7 +676,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -773,7 +773,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -860,7 +860,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -967,7 +967,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -1163,7 +1163,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -1266,7 +1266,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -1403,7 +1403,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -1500,7 +1500,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -1597,7 +1597,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -1664,7 +1664,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -1791,7 +1791,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -1851,7 +1851,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -1949,7 +1949,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -2145,7 +2145,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -2278,7 +2278,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -2375,7 +2375,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -2472,7 +2472,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -2551,7 +2551,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -2657,7 +2657,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -2749,7 +2749,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -2865,7 +2865,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -2925,7 +2925,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -3023,7 +3023,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -3219,7 +3219,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -3352,7 +3352,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -3449,7 +3449,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -3546,7 +3546,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -3625,7 +3625,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -3737,7 +3737,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -3829,7 +3829,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -3951,7 +3951,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -4011,7 +4011,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -4091,7 +4091,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -4231,7 +4231,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -4427,7 +4427,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -4560,7 +4560,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -4657,7 +4657,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -4754,7 +4754,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -4841,7 +4841,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -4901,7 +4901,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -4951,7 +4951,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5001,7 +5001,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5051,7 +5051,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5101,7 +5101,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5151,7 +5151,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5201,7 +5201,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5251,7 +5251,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5301,7 +5301,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5351,7 +5351,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.navigation.NavigationFacet" fqcn="org.apache.causeway.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenType">
                         <mml:attr name="facet" value="NavigationFacetFromHiddenType"/>
@@ -5419,7 +5419,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -5552,7 +5552,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -5748,7 +5748,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -5881,7 +5881,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -5978,7 +5978,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -6075,7 +6075,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -6168,7 +6168,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -6349,7 +6349,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacetFromCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="LayoutOrderFacetFromCollectionLayoutAnnotation"/>
@@ -6451,7 +6451,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -6647,7 +6647,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -6780,7 +6780,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -6877,7 +6877,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -6974,7 +6974,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -7055,7 +7055,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -7145,7 +7145,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -7323,7 +7323,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -7519,7 +7519,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -7652,7 +7652,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -7749,7 +7749,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -7846,7 +7846,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -7933,7 +7933,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -8135,7 +8135,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -8331,7 +8331,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -8464,7 +8464,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -8561,7 +8561,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -8658,7 +8658,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -8751,7 +8751,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -9020,7 +9020,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacetFromCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="LayoutOrderFacetFromCollectionLayoutAnnotation"/>
@@ -9122,7 +9122,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -9318,7 +9318,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -9451,7 +9451,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -9548,7 +9548,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -9645,7 +9645,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -9726,7 +9726,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -9810,7 +9810,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -9900,7 +9900,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -10155,7 +10155,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacetFromCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="LayoutOrderFacetFromCollectionLayoutAnnotation"/>
@@ -10257,7 +10257,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -10453,7 +10453,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -10586,7 +10586,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -10683,7 +10683,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -10780,7 +10780,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -10861,7 +10861,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -10945,7 +10945,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -11029,7 +11029,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -11148,7 +11148,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -11226,7 +11226,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -11322,7 +11322,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -11518,7 +11518,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -11651,7 +11651,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -11748,7 +11748,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -11845,7 +11845,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -11932,7 +11932,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -12014,7 +12014,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -12110,7 +12110,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -12306,7 +12306,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -12439,7 +12439,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -12536,7 +12536,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -12633,7 +12633,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -12720,7 +12720,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -12802,7 +12802,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -12898,7 +12898,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -13094,7 +13094,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -13227,7 +13227,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -13324,7 +13324,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -13421,7 +13421,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -13508,7 +13508,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -13723,7 +13723,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -13850,7 +13850,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -13977,7 +13977,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -14085,7 +14085,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -14203,7 +14203,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -14314,7 +14314,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -14387,7 +14387,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod">
                         <mml:attr name="facet" value="DisableForContextFacetViaMethod"/>
@@ -14499,7 +14499,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -14719,7 +14719,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -14935,7 +14935,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -15165,7 +15165,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -15395,7 +15395,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -15482,7 +15482,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -15713,7 +15713,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -15909,7 +15909,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -16012,7 +16012,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -16108,7 +16108,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -16187,7 +16187,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -16289,7 +16289,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -16526,7 +16526,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -16623,7 +16623,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -16710,7 +16710,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -16903,7 +16903,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod">
                         <mml:attr name="facet" value="DisableForContextFacetViaMethod"/>
@@ -17015,7 +17015,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -17211,7 +17211,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -17344,7 +17344,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -17441,7 +17441,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -17525,7 +17525,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -17761,7 +17761,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -17848,7 +17848,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -18041,7 +18041,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod">
                         <mml:attr name="facet" value="DisableForContextFacetViaMethod"/>
@@ -18153,7 +18153,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -18349,7 +18349,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -18482,7 +18482,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -18579,7 +18579,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -18667,7 +18667,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -18903,7 +18903,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -18990,7 +18990,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -19183,7 +19183,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod">
                         <mml:attr name="facet" value="DisableForContextFacetViaMethod"/>
@@ -19295,7 +19295,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -19491,7 +19491,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -19624,7 +19624,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -19721,7 +19721,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -19809,7 +19809,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -20045,7 +20045,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -20122,7 +20122,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -20228,7 +20228,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -20439,7 +20439,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -20538,7 +20538,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -20745,7 +20745,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -20844,7 +20844,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -21065,7 +21065,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -21164,7 +21164,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -21385,7 +21385,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -21484,7 +21484,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -21564,7 +21564,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -21661,7 +21661,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -21872,7 +21872,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -21981,7 +21981,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -22081,7 +22081,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -22190,7 +22190,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -22290,7 +22290,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -22392,7 +22392,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -22478,7 +22478,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -22573,7 +22573,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -22696,7 +22696,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -22791,7 +22791,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -22914,7 +22914,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -23009,7 +23009,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetForContributee">
                         <mml:attr name="facet" value="DisabledFacetForContributee"/>
@@ -23107,7 +23107,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -23184,7 +23184,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -23482,7 +23482,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -23678,7 +23678,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -23811,7 +23811,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -23908,7 +23908,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -24005,7 +24005,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -24092,7 +24092,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -24199,7 +24199,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -24395,7 +24395,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -24498,7 +24498,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -24594,7 +24594,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -24691,7 +24691,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -24788,7 +24788,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -24875,7 +24875,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -25023,7 +25023,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -25126,7 +25126,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -25322,7 +25322,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -25455,7 +25455,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -25552,7 +25552,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -25649,7 +25649,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -25726,7 +25726,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -25818,7 +25818,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -25911,7 +25911,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -26080,7 +26080,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod">
                         <mml:attr name="facet" value="DisableForContextFacetViaMethod"/>
@@ -26199,7 +26199,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -26395,7 +26395,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -26528,7 +26528,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -26595,7 +26595,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -26712,7 +26712,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -26809,7 +26809,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
@@ -26896,7 +26896,7 @@
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacetFromConfiguration">
                 <mml:attr name="facet" value="DomainObjectLayoutTableDecorationFacetFromConfiguration"/>
                 <mml:attr name="precedence" value="DEFAULT"/>
-                <mml:attr name="value" value="NONE"/>
+                <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
             </mml:facet>
             <mml:facet id="org.apache.causeway.core.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.grid.GridFacetDefault">
                 <mml:attr name="facet" value="GridFacetDefault"/>
@@ -27039,7 +27039,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod">
                         <mml:attr name="facet" value="DisableForContextFacetViaMethod"/>
@@ -27144,7 +27144,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -27340,7 +27340,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-download"/>
@@ -27473,7 +27473,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sitemap"/>
@@ -27540,7 +27540,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFromConfiguredRegex">
                         <mml:attr name="classes" value="!imperative"/>
@@ -27643,7 +27643,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-external-link-alt"/>
@@ -27740,7 +27740,7 @@
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet" fqcn="org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacetFromConfiguration">
                         <mml:attr name="facet" value="CollectionLayoutTableDecorationFacetFromConfiguration"/>
                         <mml:attr name="precedence" value="DEFAULT"/>
-                        <mml:attr name="value" value="NONE"/>
+                        <mml:attr name="value" value="org.apache.causeway.applib.annotation.TableDecorator.Default"/>
                     </mml:facet>
                     <mml:facet id="org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet" fqcn="org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation">
                         <mml:attr name="classes" value="fa fa-fw fa-sync"/>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
index cd096d8301..2b107d663a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
@@ -19,12 +19,14 @@
 package org.apache.causeway.viewer.wicket.ui.components.entity.collection;
 
 import java.util.List;
+import java.util.Optional;
 
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
 import org.apache.causeway.core.metamodel.consent.Consent;
 import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -106,6 +108,15 @@ implements HasDynamicallyVisibleContent {
 
     }
 
+    @Override
+    public void renderHead(final IHeaderResponse response) {
+        super.renderHead(response);
+        tableDecoration().ifPresent(tableDecorator->
+            renderHeadForTableDecorator(response, tableDecorator));
+    }
+
+    // -- HELPER
+
     private void buildGui() {
 
         val collectionModel = EntityCollectionModelParented.forParentObjectModel(getModel());
@@ -127,9 +138,10 @@ implements HasDynamicallyVisibleContent {
             Facets.cssClass(collectionMetaModel, objectAdapter)
             .ifPresent(cssClass->Wkt.cssAppend(div, cssClass));
 
-            Facets.tableDecoration(collectionMetaModel)
-                .map(CollectionLayoutConfigOptions.TableDecoration::cssClass)
-                .ifPresent(tableDecorationCssClass->Wkt.cssAppend(div, tableDecorationCssClass));
+            this.tableDecoration = Facets.tableDecoration(collectionMetaModel);
+            tableDecoration.ifPresent(tableDecorator->{
+                    Wkt.cssAppend(div, tableDecorator.cssClass());
+                });
 
             val collectionPanel = new CollectionPanel(ID_COLLECTION, collectionModel);
             div.addOrReplace(collectionPanel);
@@ -152,6 +164,17 @@ implements HasDynamicallyVisibleContent {
         }
     }
 
+    // TableDecorator caching
+    private transient Optional<TableDecorator> tableDecoration;
+    private Optional<TableDecorator> tableDecoration() {
+        if(tableDecoration==null) {
+            val collectionModel = EntityCollectionModelParented.forParentObjectModel(getModel());
+            val collectionMetaModel = collectionModel.getMetaModel();
+            this.tableDecoration = Facets.tableDecoration(collectionMetaModel);
+        }
+        return tableDecoration;
+    }
+
     private void createSelectorDropdownPanel(final EntityCollectionModel collectionModel) {
 
         final CollectionPresentationSelectorHelper selectorHelper =
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index 730eb84701..a572dcf6f7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -19,12 +19,14 @@
 package org.apache.causeway.viewer.wicket.ui.components.standalonecollection;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.Model;
 
-import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
 import org.apache.causeway.core.metamodel.util.Facets;
 import org.apache.causeway.viewer.commons.model.components.UiComponentType;
@@ -54,7 +56,6 @@ implements CollectionCountProvider, CollectionPresentationSelectorProvider {
 
     private final CollectionPresentationSelectorPanel selectorDropdownPanel;
 
-
     private MarkupContainer outerDiv = this;
 
     public StandaloneCollectionPanel(
@@ -75,9 +76,10 @@ implements CollectionCountProvider, CollectionPresentationSelectorProvider {
         Wkt.cssAppend(outerDiv, featureId);
         Wkt.cssAppend(outerDiv, collectionModel.getElementType().getFeatureIdentifier());
 
-        Facets.tableDecoration(collectionModel.getElementType())
-            .map(CollectionLayoutConfigOptions.TableDecoration::cssClass)
-            .ifPresent(tableDecorationCssClass->Wkt.cssAppend(outerDiv, tableDecorationCssClass));
+        this.tableDecoration = Facets.tableDecoration(collectionModel.getElementType());
+        tableDecoration.ifPresent(tableDecorator->{
+            Wkt.cssAppend(outerDiv, tableDecorator.cssClass());
+        });
 
         // selector
         final CollectionPresentationSelectorHelper selectorHelper = new CollectionPresentationSelectorHelper(collectionModel, getComponentFactoryRegistry());
@@ -107,6 +109,12 @@ implements CollectionCountProvider, CollectionPresentationSelectorProvider {
             .addOrReplaceComponent(outerDiv, UiComponentType.COLLECTION_CONTENTS, collectionModel);
     }
 
+    @Override
+    public void renderHead(final IHeaderResponse response) {
+        super.renderHead(response);
+        tableDecoration().ifPresent(tableDecorator->
+            renderHeadForTableDecorator(response, tableDecorator));
+    }
 
     // -- CollectionSelectorProvider
 
@@ -123,4 +131,17 @@ implements CollectionCountProvider, CollectionPresentationSelectorProvider {
         return model.getElementCount();
     }
 
+    // -- HELPER
+
+    // TableDecorator caching
+    private transient Optional<TableDecorator> tableDecoration;
+    private Optional<TableDecorator> tableDecoration() {
+        if(tableDecoration==null) {
+            val collectionModel = getModel();
+            val collectionMetaModel = collectionModel.getElementType();
+            this.tableDecoration = Facets.tableDecoration(collectionMetaModel);
+        }
+        return tableDecoration;
+    }
+
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
index c8ce6356f1..0d6d916186 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
@@ -71,11 +71,6 @@ import org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.Bread
 import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
 import org.apache.causeway.viewer.wicket.ui.errors.JGrowlBehaviour;
 import org.apache.causeway.viewer.wicket.ui.pages.common.bootstrap.css.BootstrapOverridesCssResourceReference;
-import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesCssBootstrap5ReferenceWkt;
-import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesCssReferenceWkt;
-import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesJavaScriptBootstrap5ReferenceWkt;
-import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesJavaScriptReferenceWkt;
-import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesJavaScriptResourceReferenceInit;
 import org.apache.causeway.viewer.wicket.ui.pages.common.fontawesome.FontAwesomeCssReferenceWkt;
 import org.apache.causeway.viewer.wicket.ui.pages.common.livequery.js.LiveQueryJsResourceReference;
 import org.apache.causeway.viewer.wicket.ui.pages.common.sidebar.css.SidebarCssResourceReference;
@@ -243,12 +238,6 @@ implements ActionPromptProvider {
         response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(BootstrapJavaScriptReference.instance())));
         response.render(FontAwesomeCssReferenceWkt.asHeaderItem());
 
-        response.render(DatatablesJavaScriptReferenceWkt.asHeaderItem());
-        response.render(DatatablesJavaScriptBootstrap5ReferenceWkt.asHeaderItem());
-        response.render(DatatablesCssReferenceWkt.asHeaderItem());
-        response.render(DatatablesCssBootstrap5ReferenceWkt.asHeaderItem());
-        response.render(DatatablesJavaScriptResourceReferenceInit.instance(getConfiguration()));
-
         response.render(BootstrapOverridesCssResourceReference.asHeaderItem());
         BootstrapOverridesCssResourceReference
             .contributeThemeSpecificOverrides(getApplication(), response);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
deleted file mode 100644
index 6f7df45e9c..0000000000
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  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.causeway.viewer.wicket.ui.pages.common.datatables;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import org.apache.wicket.markup.head.JavaScriptContentHeaderItem;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.util.FileCopyUtils;
-
-import org.apache.causeway.core.config.CausewayConfiguration;
-
-/**
- * Javascript (client-side) extensions and fixes.
- */
-public class DatatablesJavaScriptResourceReferenceInit extends JavaScriptContentHeaderItem {
-
-    private static final long serialVersionUID = 1L;
-
-    private static final String ID = "dataTablesInit";
-
-    private static DatatablesJavaScriptResourceReferenceInit instance = null;
-
-    public static final DatatablesJavaScriptResourceReferenceInit instance(
-            final CausewayConfiguration configuration) {
-        if (instance == null) {
-            String javascript = readResource(configuration);
-            instance = new DatatablesJavaScriptResourceReferenceInit(javascript, ID);
-        }
-        return instance;
-    }
-
-    private DatatablesJavaScriptResourceReferenceInit(final CharSequence javaScript, final String id) {
-        super(javaScript, id);
-    }
-
-    private static String readResource(final CausewayConfiguration configuration) {
-        String options = configuration.getViewer().getWicket().getTable().getDecoration()
-                .getDataTablesNet().getOptions().orElse("");
-        return readScript().replace("$PLACEHOLDER$", options);
-    }
-
-    private static String readScript() {
-        return asString(new ClassPathResource("dataTables.init.js.template",
-                DatatablesJavaScriptResourceReferenceInit.class));
-    }
-
-    private static String asString(final Resource resource) {
-        try (Reader reader = new InputStreamReader(resource.getInputStream(), UTF_8)) {
-            return FileCopyUtils.copyToString(reader);
-        } catch (IOException e) {
-            return "";
-        }
-    }
-
-}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/dataTables.init.js.template b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/dataTables.init.js.template
deleted file mode 100644
index e3cf350549..0000000000
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/dataTables.init.js.template
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  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.
- */
-(function($) {
-
-  $(document).ready( function () {
-       $('div.table-decoration table.contents').DataTable({
-            $PLACEHOLDER$
-       });
-  } );
-
-})(jQuery);
-
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
index fb03ecfa64..977c55bf07 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
@@ -19,12 +19,20 @@
 package org.apache.causeway.viewer.wicket.ui.panels;
 
 import org.apache.wicket.Component;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.springframework.lang.Nullable;
 
+import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesCssBootstrap5ReferenceWkt;
+import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesCssReferenceWkt;
+import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesJavaScriptBootstrap5ReferenceWkt;
+import org.apache.causeway.viewer.wicket.ui.pages.common.datatables.DatatablesJavaScriptReferenceWkt;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
 import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
 
 /**
@@ -96,4 +104,24 @@ extends PanelBase<T> {
         component.setVisible(visible);
     }
 
+    /**
+     * For subclasses, that render tables.
+     */
+    protected void renderHeadForTableDecorator(
+            final IHeaderResponse response,
+            final TableDecorator tableDecorator) {
+
+        //FIXME[ISIS-3329] move to an WicketApplicationInitializer
+        if(tableDecorator instanceof TableDecorator.DatatablesNet) {
+            response.render(DatatablesJavaScriptReferenceWkt.asHeaderItem());
+            response.render(DatatablesJavaScriptBootstrap5ReferenceWkt.asHeaderItem());
+            response.render(DatatablesCssReferenceWkt.asHeaderItem());
+            response.render(DatatablesCssBootstrap5ReferenceWkt.asHeaderItem());
+        }
+
+        _Strings.nonEmpty(tableDecorator.documentReadyJavaScript())
+            .map(Wkt::javaScriptAsOnDomReadyHeaderItem)
+            .ifPresent(response::render);
+    }
+
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
index 138b706df6..6fb12a2834 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
@@ -1000,6 +1000,10 @@ public class Wkt {
                 : String.format("Wicket.Event.publish(Causeway.Topic.%s)", topic.name());
     }
 
+    public OnDomReadyHeaderItem javaScriptAsOnDomReadyHeaderItem(final String javaScript) {
+        return OnDomReadyHeaderItem.forScript(javaScript);
+    }
+
     // -- TABBING UTILITY
 
     public Component noTabbing(final @Nullable Component component) {
@@ -1095,4 +1099,6 @@ public class Wkt {
         }
     }
 
+
+
 }