You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/01/21 01:03:29 UTC

[07/12] isis git commit: ISIS-970: consolidating processing into DomainObjectAnnotationFacetFactory, ActionAnnotationFF, PropertyAnnotationFF, CollectionAnnotationFF

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectSpecIdFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectSpecIdFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectSpecIdFacetForDomainObjectAnnotation.java
deleted file mode 100644
index 329c96c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectSpecIdFacetForDomainObjectAnnotation.java
+++ /dev/null
@@ -1,49 +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.isis.core.metamodel.facets.object.domainobject;
-
-import com.google.common.base.Strings;
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
-import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacetAbstract;
-
-public class ObjectSpecIdFacetForDomainObjectAnnotation extends ObjectSpecIdFacetAbstract {
-
-    public static ObjectSpecIdFacet create(
-            final DomainObject domainObject,
-            final FacetHolder holder) {
-
-        if(domainObject == null) {
-            return null;
-        }
-
-        final String objectType = domainObject.objectType();
-        if(Strings.isNullOrEmpty(objectType)) {
-            return null;
-        }
-        return new ObjectSpecIdFacetForDomainObjectAnnotation(objectType, holder);
-    }
-
-    private ObjectSpecIdFacetForDomainObjectAnnotation(final String value,
-                                                      final FacetHolder holder) {
-        super(value, holder);
-    }
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishObjectsConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishObjectsConfiguration.java
deleted file mode 100644
index 8313620..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishObjectsConfiguration.java
+++ /dev/null
@@ -1,39 +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.isis.core.metamodel.facets.object.domainobject;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-
-public enum PublishObjectsConfiguration {
-    ALL,
-    NONE;
-
-    private static final String PUBLISH_OBJECTS_KEY = "isis.services.publish.objects";
-
-    public static PublishObjectsConfiguration parse(IsisConfiguration configuration) {
-        final String configuredValue = configuration.getString(PUBLISH_OBJECTS_KEY);
-        return PublishObjectsConfiguration.parse(configuredValue);
-    }
-
-    private static PublishObjectsConfiguration parse(final String value) {
-        // must be explicitly enabled
-        return Util.parseYes(value)? ALL: NONE;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishedObjectFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishedObjectFacetForDomainObjectAnnotation.java
deleted file mode 100644
index 55b330c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishedObjectFacetForDomainObjectAnnotation.java
+++ /dev/null
@@ -1,117 +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.isis.core.metamodel.facets.object.domainobject;
-
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.PublishedObject;
-import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.PublishingChangeKind;
-import org.apache.isis.applib.annotation.PublishingPayloadFactoryForObject;
-import org.apache.isis.applib.services.publish.EventPayload;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
-import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
-
-public class PublishedObjectFacetForDomainObjectAnnotation extends PublishedObjectFacetAbstract {
-
-    public static PublishedObjectFacet create(
-            final DomainObject domainObject,
-            final IsisConfiguration configuration,
-            final FacetHolder holder) {
-
-        final Publishing publishing = domainObject != null ? domainObject.publishing() : Publishing.AS_CONFIGURED;
-
-        switch (publishing) {
-            case AS_CONFIGURED:
-
-                final PublishObjectsConfiguration setting = PublishObjectsConfiguration.parse(configuration);
-                switch (setting) {
-                    case NONE:
-                        return null;
-                    default:
-                    return new PublishedObjectFacetForDomainObjectAnnotationAsConfigured(
-                            newPayloadFactory(domainObject), holder);
-                }
-            case DISABLED:
-                return null;
-            case ENABLED:
-                return new PublishedObjectFacetForDomainObjectAnnotation(
-                        newPayloadFactory(domainObject), holder);
-        }
-        return null;
-    }
-
-    /**
-     * @return null means that the default payload factories will be used; this is handled within IsisTransaction.
-     */
-    protected static PublishingPayloadFactoryForObject newPayloadFactory(final DomainObject domainObject) {
-        if(domainObject == null) {
-            return null;
-        }
-        final Class<? extends PublishingPayloadFactoryForObject> value = domainObject.publishingPayloadFactory();
-        if(value == null) {
-            return null;
-        }
-        try {
-            return value.newInstance();
-        } catch (final InstantiationException e) {
-            return null;
-        } catch (final IllegalAccessException e) {
-            return null;
-        }
-    }
-
-
-    PublishedObjectFacetForDomainObjectAnnotation(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
-        super(legacyPayloadFactoryFor(publishingPayloadFactory), holder);
-    }
-
-    private static PublishedObject.PayloadFactory legacyPayloadFactoryFor(final PublishingPayloadFactoryForObject publishingPayloadFactory) {
-        if(publishingPayloadFactory instanceof PublishingPayloadFactoryForObject.Adapter) {
-            final PublishingPayloadFactoryForObject.Adapter adapter = (PublishingPayloadFactoryForObject.Adapter) publishingPayloadFactory;
-            return adapter.getPayloadFactory();
-        }
-        return new LegacyAdapter(publishingPayloadFactory);
-    }
-
-    static class LegacyAdapter implements PublishedObject.PayloadFactory {
-
-        private final PublishingPayloadFactoryForObject payloadFactory;
-
-        LegacyAdapter(final PublishingPayloadFactoryForObject payloadFactory) {
-            this.payloadFactory = payloadFactory;
-        }
-
-        @Override
-        public EventPayload payloadFor(final Object changedObject, final PublishedObject.ChangeKind changeKind) {
-            return payloadFactory.payloadFor(changedObject, PublishingChangeKind.from(changeKind));
-        }
-
-        /**
-         * For testing only.
-         * @return
-         */
-        PublishingPayloadFactoryForObject getPayloadFactory() {
-            return payloadFactory;
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
deleted file mode 100644
index 72077a1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
+++ /dev/null
@@ -1,31 +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.isis.core.metamodel.facets.object.domainobject;
-
-import org.apache.isis.applib.annotation.PublishingPayloadFactoryForObject;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-public class PublishedObjectFacetForDomainObjectAnnotationAsConfigured extends PublishedObjectFacetForDomainObjectAnnotation {
-
-
-    PublishedObjectFacetForDomainObjectAnnotationAsConfigured(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
-        super(publishingPayloadFactory, holder);
-    }
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/RecreatableObjectFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/RecreatableObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/RecreatableObjectFacetForDomainObjectAnnotation.java
deleted file mode 100644
index f3bcee7..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/RecreatableObjectFacetForDomainObjectAnnotation.java
+++ /dev/null
@@ -1,94 +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.isis.core.metamodel.facets.object.domainobject;
-
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
-import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacetDeclarativeAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-
-public class RecreatableObjectFacetForDomainObjectAnnotation extends RecreatableObjectFacetDeclarativeAbstract {
-
-    public static ViewModelFacet create(
-            final DomainObject domainObject,
-            final SpecificationLoader specificationLoader,
-            final AdapterManager adapterManager,
-            final ServicesInjector servicesInjector,
-            final FacetHolder holder) {
-
-        if(domainObject == null) {
-            return null;
-        }
-
-        final Nature nature = domainObject.nature();
-
-        if(nature == null || nature == Nature.JDO_ENTITY) {
-            return null;
-        }
-
-        switch (nature)
-        {
-            case NOT_SPECIFIED:
-            case JDO_ENTITY:
-                // not a recreatable object, so no facet
-                return null;
-
-            case VIEW_MODEL:
-                final ViewModelFacet existingFacet = holder.getFacet(ViewModelFacet.class);
-                if (existingFacet != null) {
-                    if (existingFacet.getArchitecturalLayer() == ArchitecturalLayer.APPLICATION) {
-                        // if compatible existing facet, then just ignore
-                        // (otherwise the metamodel
-                        return null;
-                    }
-                    // otherwise, we continue through and add the new facet making the existing one the
-                    // underlying.  The metamodel validator on RecreatableObjectFacetFactory will then mark the
-                    // model as invalid because of incompatible semantics.
-                }
-                return new RecreatableObjectFacetForDomainObjectAnnotation(
-                        holder,
-                        ArchitecturalLayer.APPLICATION,
-                        specificationLoader, adapterManager, servicesInjector);
-
-            case EXTERNAL_ENTITY:
-            case INMEMORY_ENTITY:
-                return new RecreatableObjectFacetForDomainObjectAnnotation(
-                        holder,
-                        ArchitecturalLayer.DOMAIN,
-                        specificationLoader, adapterManager, servicesInjector);
-        }
-        // shouldn't happen, the above switch should match all cases.
-        throw new IllegalArgumentException("nature of '" + nature + "' not recognized");
-    }
-
-    private RecreatableObjectFacetForDomainObjectAnnotation(
-            final FacetHolder holder,
-            final ArchitecturalLayer architecturalLayer,
-            final SpecificationLoader specificationLoader,
-            final AdapterManager adapterManager,
-            final ServicesInjector servicesInjector) {
-        super(holder, architecturalLayer, specificationLoader, adapterManager, servicesInjector);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/Util.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/Util.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/Util.java
index bf3056d..b3afef4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/Util.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/Util.java
@@ -34,7 +34,7 @@ public final class Util {
         return parse(value, "all", "yes", "y", "true", "1", "enable", "enabled");
     }
 
-    static boolean parseNo(final String value) {
+    public static boolean parseNo(final String value) {
         return parse(value, "none", "no", "n", "false", "0", "disable", "disabled");
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
new file mode 100644
index 0000000..ace08eb
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
+
+public enum AuditObjectsConfiguration {
+    ALL,
+    NONE;
+
+    private static final String AUDIT_OBJECTS_KEY = "isis.services.audit.objects";
+
+    public static AuditObjectsConfiguration parse(IsisConfiguration configuration) {
+        final String configuredValue = configuration.getString(AUDIT_OBJECTS_KEY);
+        return AuditObjectsConfiguration.parse(configuredValue);
+    }
+
+    private static AuditObjectsConfiguration parse(final String value) {
+        // must be explicitly enabled
+        return Util.parseYes(value)? ALL: NONE;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForAuditedAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForAuditedAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForAuditedAnnotation.java
new file mode 100644
index 0000000..9668dec
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForAuditedAnnotation.java
@@ -0,0 +1,43 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
+
+
+import org.apache.isis.applib.annotation.Audited;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
+import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacetImpl;
+
+
+@Deprecated
+public class AuditableFacetForAuditedAnnotation extends AuditableFacetImpl {
+
+    public AuditableFacetForAuditedAnnotation(final FacetHolder facetHolder, final Enablement enablement) {
+        super(facetHolder, enablement);
+    }
+
+    public static AuditableFacet create(final Audited annotation, final FacetHolder holder) {
+        if (annotation == null) {
+            return null;
+        }
+        return new AuditableFacetForAuditedAnnotation(
+                holder,
+                Enablement.ifDisabled(annotation.disabled()));
+    }
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
new file mode 100644
index 0000000..d1cbf60
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
@@ -0,0 +1,63 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
+
+
+import org.apache.isis.applib.annotation.Auditing;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
+import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacetAbstract;
+
+
+public class AuditableFacetForDomainObjectAnnotation extends AuditableFacetAbstract {
+
+    public static AuditableFacet create(
+            final DomainObject domainObject,
+            final IsisConfiguration configuration,
+            final FacetHolder holder) {
+
+        final Auditing auditing = domainObject != null ? domainObject.auditing() : Auditing.AS_CONFIGURED;
+        switch (auditing) {
+            case AS_CONFIGURED:
+
+                final AuditObjectsConfiguration setting = AuditObjectsConfiguration.parse(configuration);
+                switch (setting) {
+                    case NONE:
+                        return null;
+                    default:
+                        return domainObject != null
+                                ? new AuditableFacetForDomainObjectAnnotationAsConfigured(holder)
+                                : new AuditableFacetFromConfiguration(holder);
+                }
+            case DISABLED:
+                return null;
+            case ENABLED:
+                return new AuditableFacetForDomainObjectAnnotation(Enablement.ENABLED, holder);
+        }
+        return null;
+    }
+
+    protected AuditableFacetForDomainObjectAnnotation(
+            final Enablement enablement,
+            final FacetHolder holder) {
+        super(holder, enablement);
+    }
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java
new file mode 100644
index 0000000..b213e66
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java
@@ -0,0 +1,31 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
+
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+
+
+public class AuditableFacetForDomainObjectAnnotationAsConfigured extends AuditableFacetForDomainObjectAnnotation {
+
+    public AuditableFacetForDomainObjectAnnotationAsConfigured(final FacetHolder facetHolder) {
+        super(Enablement.ENABLED, facetHolder);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
new file mode 100644
index 0000000..1d7f7fc
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
@@ -0,0 +1,36 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
+
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacetAbstract;
+
+
+/**
+ * If the domain object has not been annotated with {@link org.apache.isis.applib.annotation.DomainObject} but auditing
+ * has been configured in <tt>isis.properties</tt>.
+ */
+public class AuditableFacetFromConfiguration extends AuditableFacetAbstract {
+
+    public AuditableFacetFromConfiguration(final FacetHolder facetHolder) {
+        super(facetHolder, Enablement.ENABLED);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
new file mode 100644
index 0000000..222482e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
@@ -0,0 +1,75 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.autocomplete;
+
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
+import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacetAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+
+public class AutoCompleteFacetForDomainObjectAnnotation extends AutoCompleteFacetAbstract {
+
+    private final Class<?> repositoryClass;
+    private final String actionName;
+
+    public static AutoCompleteFacet create(
+            final DomainObject domainObject,
+            final SpecificationLoader specificationLoader,
+            final AdapterManager adapterManager,
+            final ServicesInjector servicesInjector,
+            final FacetHolder holder) {
+
+        if(domainObject == null) {
+            return null;
+        }
+
+        final Class<?> autoCompleteRepository = domainObject.autoCompleteRepository();
+        if(autoCompleteRepository == null || autoCompleteRepository == Object.class) {
+            return null;
+        }
+        final String autoCompleteAction = domainObject.autoCompleteAction();
+        return new AutoCompleteFacetForDomainObjectAnnotation(holder, autoCompleteRepository, autoCompleteAction, specificationLoader, adapterManager, servicesInjector);
+    }
+
+    private AutoCompleteFacetForDomainObjectAnnotation(
+            final FacetHolder holder, final Class<?> repositoryClass, final String actionName, final SpecificationLoader specificationLoader, final AdapterManager adapterManager, final ServicesInjector servicesInjector) {
+        super(holder, repositoryClass, actionName, specificationLoader, adapterManager, servicesInjector);
+        this.repositoryClass = repositoryClass;
+        this.actionName = actionName;
+    }
+
+
+    /**
+     * Introduced for testing only.
+     */
+    public Class<?> getRepositoryClass() {
+        return repositoryClass;
+    }
+
+    /**
+     * Introduced for testing only.
+     */
+    public String getActionName() {
+        return actionName;
+    }
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java
new file mode 100644
index 0000000..75bc114
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/choices/ChoicesFacetForDomainObjectAnnotation.java
@@ -0,0 +1,47 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.choices;
+
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.choices.ChoicesFacetFromBoundedAbstract;
+
+public class ChoicesFacetForDomainObjectAnnotation extends ChoicesFacetFromBoundedAbstract {
+
+    public static Facet create(
+            final DomainObject domainObject,
+            final QuerySubmitter querySubmitter,
+            final FacetHolder facetHolder) {
+
+        if(domainObject == null) {
+            return null;
+        }
+
+        final boolean bounded = domainObject.bounded();
+        return bounded ? new ChoicesFacetForDomainObjectAnnotation(facetHolder, querySubmitter): null;
+    }
+
+    private ChoicesFacetForDomainObjectAnnotation(final FacetHolder holder, final QuerySubmitter querySubmitter) {
+        super(holder, querySubmitter);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
new file mode 100644
index 0000000..df98352
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.facets.object.domainobject.editing;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
+
+public enum EditingObjectsConfiguration {
+    TRUE,
+    FALSE;
+
+    private static final String EDIT_OBJECTS_KEY = "isis.objects.editing";
+
+    public static EditingObjectsConfiguration parse(final IsisConfiguration configuration) {
+        final String configuredValue = configuration.getString(EDIT_OBJECTS_KEY);
+        return EditingObjectsConfiguration.parse(configuredValue);
+    }
+
+    private static EditingObjectsConfiguration parse(final String value) {
+        // must be explicitly disabled
+        return Util.parseNo(value)? FALSE : TRUE;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
new file mode 100644
index 0000000..e931ddc
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -0,0 +1,86 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.editing;
+
+import com.google.common.base.Strings;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.When;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacetAbstract;
+
+public class ImmutableFacetForDomainObjectAnnotation extends ImmutableFacetAbstract {
+
+    private final String reason;
+
+    public static ImmutableFacet create(
+            final DomainObject domainObject,
+            final IsisConfiguration configuration,
+            final FacetHolder holder) {
+
+        final Editing editing       = domainObject != null? domainObject.editing() : Editing.AS_CONFIGURED;
+        final String disabledReason = domainObject != null? domainObject.editingDisabledReason(): "Disabled";
+
+        switch (editing) {
+            case AS_CONFIGURED:
+
+                if(holder.containsDoOpFacet(ImmutableFacet.class)) {
+                    // do not replace
+                    return null;
+                }
+
+                final EditingObjectsConfiguration setting = EditingObjectsConfiguration.parse(configuration);
+                return setting == EditingObjectsConfiguration.FALSE
+                        ? domainObject != null
+                                ? new ImmutableFacetForDomainObjectAnnotationAsConfigured(disabledReason, holder)
+                                : new ImmutableFacetFromConfiguration(disabledReason, holder)
+                        : null;
+            case DISABLED:
+                return new ImmutableFacetForDomainObjectAnnotation(disabledReason, holder);
+            case ENABLED:
+                return null;
+        }
+        return null;
+    }
+
+    public ImmutableFacetForDomainObjectAnnotation(final String reason, final FacetHolder holder) {
+        super(When.ALWAYS, holder);
+        this.reason = reason;
+    }
+
+    @Override
+    public String disabledReason(final ObjectAdapter targetAdapter) {
+        return !Strings.isNullOrEmpty(reason)
+                ? reason
+                : super.disabledReason(targetAdapter);
+    }
+
+    @Override
+    public void copyOnto(final FacetHolder holder) {
+        final Facet facet = new ImmutableFacetForDomainObjectAnnotation(reason, holder);
+        FacetUtil.addFacet(facet);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotationAsConfigured.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotationAsConfigured.java
new file mode 100644
index 0000000..511d77e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotationAsConfigured.java
@@ -0,0 +1,30 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.editing;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+
+public class ImmutableFacetForDomainObjectAnnotationAsConfigured extends ImmutableFacetForDomainObjectAnnotation {
+
+    public ImmutableFacetForDomainObjectAnnotationAsConfigured(final String reason, final FacetHolder holder) {
+        super(reason,holder);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
new file mode 100644
index 0000000..afe6786
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
@@ -0,0 +1,52 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.editing;
+
+import com.google.common.base.Strings;
+import org.apache.isis.applib.annotation.When;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacetAbstract;
+
+public class ImmutableFacetFromConfiguration extends ImmutableFacetAbstract {
+
+    private final String reason;
+
+    public ImmutableFacetFromConfiguration(final String reason, final FacetHolder holder) {
+        super(When.ALWAYS, holder);
+        this.reason = reason;
+    }
+
+    @Override
+    public String disabledReason(final ObjectAdapter targetAdapter) {
+        return !Strings.isNullOrEmpty(reason)
+                ? reason
+                : super.disabledReason(targetAdapter);
+    }
+
+    @Override
+    public void copyOnto(final FacetHolder holder) {
+        final Facet facet = new ImmutableFacetForDomainObjectAnnotation(reason, holder);
+        FacetUtil.addFacet(facet);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
new file mode 100644
index 0000000..d96c071
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForDomainObjectAnnotation.java
@@ -0,0 +1,49 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid;
+
+import com.google.common.base.Strings;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
+import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacetAbstract;
+
+public class ObjectSpecIdFacetForDomainObjectAnnotation extends ObjectSpecIdFacetAbstract {
+
+    public static ObjectSpecIdFacet create(
+            final DomainObject domainObject,
+            final FacetHolder holder) {
+
+        if(domainObject == null) {
+            return null;
+        }
+
+        final String objectType = domainObject.objectType();
+        if(Strings.isNullOrEmpty(objectType)) {
+            return null;
+        }
+        return new ObjectSpecIdFacetForDomainObjectAnnotation(objectType, holder);
+    }
+
+    private ObjectSpecIdFacetForDomainObjectAnnotation(final String value,
+                                                      final FacetHolder holder) {
+        super(value, holder);
+    }
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
new file mode 100644
index 0000000..d878ec8
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.core.metamodel.facets.object.domainobject.publishing;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facets.object.domainobject.Util;
+
+public enum PublishObjectsConfiguration {
+    ALL,
+    NONE;
+
+    private static final String PUBLISH_OBJECTS_KEY = "isis.services.publish.objects";
+
+    public static PublishObjectsConfiguration parse(IsisConfiguration configuration) {
+        final String configuredValue = configuration.getString(PUBLISH_OBJECTS_KEY);
+        return PublishObjectsConfiguration.parse(configuredValue);
+    }
+
+    private static PublishObjectsConfiguration parse(final String value) {
+        // must be explicitly enabled
+        return Util.parseYes(value)? ALL: NONE;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
new file mode 100644
index 0000000..8dfa0b4
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
@@ -0,0 +1,85 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.publishing;
+
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.PublishingPayloadFactoryForObject;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
+
+public class PublishedObjectFacetForDomainObjectAnnotation extends PublishedObjectFacetAbstract {
+
+    public static PublishedObjectFacet create(
+            final DomainObject domainObject,
+            final IsisConfiguration configuration,
+            final FacetHolder holder) {
+
+        final Publishing publishing = domainObject != null ? domainObject.publishing() : Publishing.AS_CONFIGURED;
+
+        switch (publishing) {
+            case AS_CONFIGURED:
+
+                final PublishObjectsConfiguration setting = PublishObjectsConfiguration.parse(configuration);
+                switch (setting) {
+                    case NONE:
+                        return null;
+                    default:
+                        final PublishingPayloadFactoryForObject publishingPayloadFactory = newPayloadFactory(domainObject);
+                        return domainObject != null
+                            ? new PublishedObjectFacetForDomainObjectAnnotationAsConfigured(publishingPayloadFactory, holder)
+                            : new PublishedObjectFacetFromConfiguration(publishingPayloadFactory, holder);
+                }
+            case DISABLED:
+                return null;
+            case ENABLED:
+                return new PublishedObjectFacetForDomainObjectAnnotation(
+                        newPayloadFactory(domainObject), holder);
+        }
+        return null;
+    }
+
+    /**
+     * @return null means that the default payload factories will be used; this is handled within IsisTransaction.
+     */
+    protected static PublishingPayloadFactoryForObject newPayloadFactory(final DomainObject domainObject) {
+        if(domainObject == null) {
+            return null;
+        }
+        final Class<? extends PublishingPayloadFactoryForObject> value = domainObject.publishingPayloadFactory();
+        if(value == null) {
+            return null;
+        }
+        try {
+            return value.newInstance();
+        } catch (final InstantiationException e) {
+            return null;
+        } catch (final IllegalAccessException e) {
+            return null;
+        }
+    }
+
+    PublishedObjectFacetForDomainObjectAnnotation(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
+        super(publishingPayloadFactory, holder);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
new file mode 100644
index 0000000..ed513a6
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
@@ -0,0 +1,31 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.publishing;
+
+import org.apache.isis.applib.annotation.PublishingPayloadFactoryForObject;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+
+public class PublishedObjectFacetForDomainObjectAnnotationAsConfigured extends PublishedObjectFacetForDomainObjectAnnotation {
+
+
+    PublishedObjectFacetForDomainObjectAnnotationAsConfigured(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
+        super(publishingPayloadFactory, holder);
+    }
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForPublishedObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForPublishedObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForPublishedObjectAnnotation.java
new file mode 100644
index 0000000..8f89af0
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForPublishedObjectAnnotation.java
@@ -0,0 +1,58 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.publishing;
+
+import org.apache.isis.applib.annotation.PublishedObject;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
+
+@Deprecated
+public class PublishedObjectFacetForPublishedObjectAnnotation extends PublishedObjectFacetAbstract {
+
+    public static PublishedObjectFacet create(
+            final PublishedObject publishedObject,
+            final FacetHolder holder) {
+
+        if (publishedObject == null) {
+            return null;
+        }
+
+        else return new PublishedObjectFacetForPublishedObjectAnnotation(newPayloadFactory(publishedObject.value()), holder);
+    }
+
+    private PublishedObjectFacetForPublishedObjectAnnotation(final PublishedObject.PayloadFactory payloadFactory, final FacetHolder holder) {
+        super(payloadFactory, holder);
+    }
+
+    private static PublishedObject.PayloadFactory newPayloadFactory(final Class<? extends PublishedObject.PayloadFactory> value) {
+        if(value == null) {
+            return null;
+        }
+        try {
+            return value.newInstance();
+        } catch (final InstantiationException e) {
+            return null;
+        } catch (final IllegalAccessException e) {
+            return null;
+        }
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java
new file mode 100644
index 0000000..fd9ce9e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java
@@ -0,0 +1,32 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.publishing;
+
+import org.apache.isis.applib.annotation.PublishingPayloadFactoryForObject;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
+
+public class PublishedObjectFacetFromConfiguration extends PublishedObjectFacetAbstract {
+
+    PublishedObjectFacetFromConfiguration(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
+        super(publishingPayloadFactory, holder);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
new file mode 100644
index 0000000..60e3a5f
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
@@ -0,0 +1,94 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.domainobject.recreatable;
+
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
+import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacetDeclarativeAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+
+public class RecreatableObjectFacetForDomainObjectAnnotation extends RecreatableObjectFacetDeclarativeAbstract {
+
+    public static ViewModelFacet create(
+            final DomainObject domainObject,
+            final SpecificationLoader specificationLoader,
+            final AdapterManager adapterManager,
+            final ServicesInjector servicesInjector,
+            final FacetHolder holder) {
+
+        if(domainObject == null) {
+            return null;
+        }
+
+        final Nature nature = domainObject.nature();
+
+        if(nature == null || nature == Nature.JDO_ENTITY) {
+            return null;
+        }
+
+        switch (nature)
+        {
+            case NOT_SPECIFIED:
+            case JDO_ENTITY:
+                // not a recreatable object, so no facet
+                return null;
+
+            case VIEW_MODEL:
+                final ViewModelFacet existingFacet = holder.getFacet(ViewModelFacet.class);
+                if (existingFacet != null) {
+                    if (existingFacet.getArchitecturalLayer() == ArchitecturalLayer.APPLICATION) {
+                        // if compatible existing facet, then just ignore
+                        // (otherwise the metamodel
+                        return null;
+                    }
+                    // otherwise, we continue through and add the new facet making the existing one the
+                    // underlying.  The metamodel validator on RecreatableObjectFacetFactory will then mark the
+                    // model as invalid because of incompatible semantics.
+                }
+                return new RecreatableObjectFacetForDomainObjectAnnotation(
+                        holder,
+                        ArchitecturalLayer.APPLICATION,
+                        specificationLoader, adapterManager, servicesInjector);
+
+            case EXTERNAL_ENTITY:
+            case INMEMORY_ENTITY:
+                return new RecreatableObjectFacetForDomainObjectAnnotation(
+                        holder,
+                        ArchitecturalLayer.DOMAIN,
+                        specificationLoader, adapterManager, servicesInjector);
+        }
+        // shouldn't happen, the above switch should match all cases.
+        throw new IllegalArgumentException("nature of '" + nature + "' not recognized");
+    }
+
+    private RecreatableObjectFacetForDomainObjectAnnotation(
+            final FacetHolder holder,
+            final ArchitecturalLayer architecturalLayer,
+            final SpecificationLoader specificationLoader,
+            final AdapterManager adapterManager,
+            final ServicesInjector servicesInjector) {
+        super(holder, architecturalLayer, specificationLoader, adapterManager, servicesInjector);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java
new file mode 100644
index 0000000..fa500f2
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/CopyImmutableFacetOntoMembersFactory.java
@@ -0,0 +1,45 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.core.metamodel.facets.object.immutable.immutableannot;
+
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+
+public class CopyImmutableFacetOntoMembersFactory extends FacetFactoryAbstract {
+
+    public CopyImmutableFacetOntoMembersFactory() {
+        super(FeatureType.MEMBERS);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final FacetedMethod member = processMethodContext.getFacetHolder();
+        final Class<?> owningClass = processMethodContext.getCls();
+        final ObjectSpecification owningSpec = getSpecificationLoader().loadSpecification(owningClass);
+        final ImmutableFacet facet = owningSpec.getFacet(ImmutableFacet.class);
+        if (facet != null) {
+            facet.copyOnto(member);
+        }
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java
deleted file mode 100644
index a16d4be..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java
+++ /dev/null
@@ -1,59 +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.isis.core.metamodel.facets.object.immutable.immutableannot;
-
-import org.apache.isis.applib.annotation.Immutable;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.Annotations;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-public class ImmutableFacetAnnotationFactory extends FacetFactoryAbstract {
-
-    public ImmutableFacetAnnotationFactory() {
-        super(FeatureType.EVERYTHING_BUT_PARAMETERS);
-    }
-
-    @Override
-    public void process(final ProcessClassContext processClassContaxt) {
-        final Immutable annotation = Annotations.getAnnotation(processClassContaxt.getCls(), Immutable.class);
-        FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
-    }
-
-    @Override
-    public void process(final ProcessMethodContext processMethodContext) {
-        final FacetedMethod member = processMethodContext.getFacetHolder();
-        final Class<?> owningClass = processMethodContext.getCls();
-        final ObjectSpecification owningSpec = getSpecificationLoader().loadSpecification(owningClass);
-        final ImmutableFacet facet = owningSpec.getFacet(ImmutableFacet.class);
-        if (facet != null) {
-            facet.copyOnto(member);
-        }
-    }
-
-    private ImmutableFacet create(final Immutable annotation, final FacetHolder holder) {
-        return annotation == null ? null : new ImmutableFacetForImmutableAnnotation(annotation.value(), holder);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java
index b392c66..4576d93 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java
@@ -19,16 +19,25 @@
 
 package org.apache.isis.core.metamodel.facets.object.immutable.immutableannot;
 
+import org.apache.isis.applib.annotation.Immutable;
 import org.apache.isis.applib.annotation.When;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacetAbstract;
 
 @Deprecated
 public class ImmutableFacetForImmutableAnnotation extends ImmutableFacetAbstract {
 
-    public ImmutableFacetForImmutableAnnotation(final When value, final FacetHolder holder) {
+    public static ImmutableFacet create(final Immutable annotation, final FacetHolder facetHolder) {
+        if (annotation == null) {
+            return null;
+        }
+        return new ImmutableFacetForImmutableAnnotation(annotation.value(), facetHolder);
+    }
+
+    private ImmutableFacetForImmutableAnnotation(final When value, final FacetHolder holder) {
         super(value, holder);
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
index de259dd..60f32fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
@@ -20,6 +20,9 @@
 package org.apache.isis.core.metamodel.facets.object.publishedobject;
 
 import org.apache.isis.applib.annotation.PublishedObject;
+import org.apache.isis.applib.annotation.PublishingChangeKind;
+import org.apache.isis.applib.annotation.PublishingPayloadFactoryForObject;
+import org.apache.isis.applib.services.publish.EventPayload;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleValueFacetAbstract;
@@ -34,4 +37,38 @@ public abstract class PublishedObjectFacetAbstract extends SingleValueFacetAbstr
         super(type(), payloadFactory, holder);
     }
 
+    protected PublishedObjectFacetAbstract(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
+        this(legacyPayloadFactoryFor(publishingPayloadFactory), holder);
+    }
+
+    protected static PublishedObject.PayloadFactory legacyPayloadFactoryFor(final PublishingPayloadFactoryForObject publishingPayloadFactory) {
+        if(publishingPayloadFactory instanceof PublishingPayloadFactoryForObject.Adapter) {
+            final PublishingPayloadFactoryForObject.Adapter adapter = (PublishingPayloadFactoryForObject.Adapter) publishingPayloadFactory;
+            return adapter.getPayloadFactory();
+        }
+        return new LegacyAdapter(publishingPayloadFactory);
+    }
+
+    public static class LegacyAdapter implements PublishedObject.PayloadFactory {
+
+        private final PublishingPayloadFactoryForObject payloadFactory;
+
+        LegacyAdapter(final PublishingPayloadFactoryForObject payloadFactory) {
+            this.payloadFactory = payloadFactory;
+        }
+
+        @Override
+        public EventPayload payloadFor(final Object changedObject, final PublishedObject.ChangeKind changeKind) {
+            return payloadFactory.payloadFor(changedObject, PublishingChangeKind.from(changeKind));
+        }
+
+        /**
+         * For testing only.
+         * @return
+         */
+        public PublishingPayloadFactoryForObject getPayloadFactory() {
+            return payloadFactory;
+        }
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetAnnotationFactory.java
deleted file mode 100644
index c34da38..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetAnnotationFactory.java
+++ /dev/null
@@ -1,40 +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.isis.core.metamodel.facets.object.publishedobject.annotation;
-
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-
-public class PublishedObjectFacetAnnotationFactory extends FacetFactoryAbstract {
-
-    public PublishedObjectFacetAnnotationFactory() {
-        super(FeatureType.OBJECTS_ONLY);
-    }
-
-    @Override
-    public void process(final ProcessClassContext processClassContext) {
-
-        //
-        // moved to DomainObjectAnnotationFacetFactory
-        //
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/74e1f371/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetForPublishedObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetForPublishedObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetForPublishedObjectAnnotation.java
deleted file mode 100644
index 21f1a0b..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetForPublishedObjectAnnotation.java
+++ /dev/null
@@ -1,58 +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.isis.core.metamodel.facets.object.publishedobject.annotation;
-
-import org.apache.isis.applib.annotation.PublishedObject;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
-import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
-
-@Deprecated
-public class PublishedObjectFacetForPublishedObjectAnnotation extends PublishedObjectFacetAbstract {
-
-    public static PublishedObjectFacet create(
-            final PublishedObject publishedObject,
-            final FacetHolder holder) {
-
-        if (publishedObject == null) {
-            return null;
-        }
-
-        else return new PublishedObjectFacetForPublishedObjectAnnotation(newPayloadFactory(publishedObject.value()), holder);
-    }
-
-    private PublishedObjectFacetForPublishedObjectAnnotation(final PublishedObject.PayloadFactory payloadFactory, final FacetHolder holder) {
-        super(payloadFactory, holder);
-    }
-
-    private static PublishedObject.PayloadFactory newPayloadFactory(final Class<? extends PublishedObject.PayloadFactory> value) {
-        if(value == null) {
-            return null;
-        }
-        try {
-            return value.newInstance();
-        } catch (final InstantiationException e) {
-            return null;
-        } catch (final IllegalAccessException e) {
-            return null;
-        }
-    }
-
-}