This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 9a6686e ISIS-2464: semantic renaming audit/dispatch -> publishing (8)
9a6686e is described below
commit 9a6686e84c548a12e33a2fa4fedd1fafe78a8a9e
Author: Andi Huber <[email protected]>
AuthorDate: Fri Nov 20 13:00:07 2020 +0100
ISIS-2464: semantic renaming audit/dispatch -> publishing (8)
---
.../apache/isis/applib/annotation/Auditing.java | 61 ----------------------
.../isis/applib/annotation/DomainObject.java | 6 +--
.../apache/isis/applib/annotation/Property.java | 2 +-
.../DomainObjectAnnotationFacetFactory.java | 2 +-
.../AuditableFacetForDomainObjectAnnotation.java | 12 ++---
...DispatchPropertyFacetForPropertyAnnotation.java | 2 +-
.../Annotations_getAnnotations_on_Field_Test.java | 26 ++++-----
.../DomainObjectAnnotationFacetFactoryTest.java | 6 +--
.../disabled/DomainObjectAuditingDisabledJdo.java | 4 +-
.../enabled/DomainObjectAuditingEnabledJdo.java | 4 +-
.../DomainObjectAuditingEnabledMetaAnnotation.java | 4 +-
...DomainObjectAuditingDisabledMetaAnnotation.java | 4 +-
...bjectAuditingEnabledMetaAnnotOverriddenJdo.java | 4 +-
...rtyExecutionDispatchDisabledMetaAnnotation.java | 4 +-
...ertyExecutionDispatchEnabledMetaAnnotation.java | 2 +-
.../PropertyExecutionDispatchJdo.java | 4 +-
.../isis/testdomain/jdo/entities/JdoBook.java | 4 +-
.../isis/testdomain/jdo/entities/JdoInventory.java | 4 +-
.../isis/testdomain/jpa/entities/JpaBook.java | 4 +-
.../isis/testdomain/jpa/entities/JpaInventory.java | 4 +-
20 files changed, 51 insertions(+), 112 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
deleted file mode 100644
index 01fdf3c..0000000
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
+++ /dev/null
@@ -1,61 +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.applib.annotation;
-
-/**
- * The available policies for auditing changes to the properties of the object.
- */
-// tag::refguide[]
-public enum Auditing {
-
- // end::refguide[]
- /**
- * The auditing of the object should be as per the default auditing policy
configured in <tt>application.properties</tt>.
- *
- * <p>
- * If no auditing policy is configured, then the auditing is disabled.
- * </p>
- */
- // tag::refguide[]
- AS_CONFIGURED,
-
- // end::refguide[]
- /**
- * Audit changes to this object.
- */
- // tag::refguide[]
- ENABLED,
-
- // end::refguide[]
- /**
- * Do not audit changes to this object (even if otherwise configured to
enable auditing).
- */
- // tag::refguide[]
- DISABLED,
-
- // end::refguide[]
- /**
- * Ignore the value provided by this annotation (meaning that the
framework will keep searching, in meta
- * annotations or superclasses/interfaces).
- */
- // tag::refguide[]
- NOT_SPECIFIED
-
-}
-// end::refguide[]
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
index c3f8ab3..fc882a5 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
@@ -63,15 +63,15 @@ public @interface DomainObject {
// end::refguide-lifecycle-events[]
// end::refguide-domain-events[]
/**
- * Whether entity changes should be dispatched to
+ * Whether entity changes should be published to
* {@link
org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber}s
* and whether entity changes, captured as {@link
org.apache.isis.applib.services.publishing.spi.EntityChanges},
* should be dispatched to {@link
org.apache.isis.applib.services.publishing.spi.EntityChangesSubscriber}s.
* @apiNote does only apply to entity objects
*/
// tag::refguide[]
- Auditing auditing() // <.>
- default Auditing.NOT_SPECIFIED;
+ Publishing entityChangePublishing() // <.>
+ default Publishing.NOT_SPECIFIED;
// end::refguide[]
/**
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index fad3e57..3a29c4a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -126,7 +126,7 @@ public @interface Property {
* {@link ExecutionSubscriber}s.
*/
// tag::refguide[]
- Publishing executionDispatch() // <.>
+ Publishing executionPublishing() // <.>
default Publishing.NOT_SPECIFIED;
// end::refguide[]
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 0172951..3e93b32 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -138,7 +138,7 @@ implements MetaModelRefiner, PostConstructMethodCache,
ObjectSpecIdFacetFactory
}
// check for @DomainObject(auditing=....)
- val auditing =
processClassContext.synthesizeOnType(DomainObject.class).map(DomainObject::auditing);
+ val auditing =
processClassContext.synthesizeOnType(DomainObject.class).map(DomainObject::entityChangePublishing);
val auditableFacet = AuditableFacetForDomainObjectAnnotation
.create(auditing, getConfiguration(), facetHolder);
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
index 88647d3..f09eb39 100644
---
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
@@ -21,7 +21,7 @@ package
org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
import java.util.Optional;
-import org.apache.isis.applib.annotation.Auditing;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies;
@@ -34,13 +34,13 @@ import lombok.val;
public class AuditableFacetForDomainObjectAnnotation extends
AuditableFacetAbstract {
public static AuditableFacet create(
- Optional<Auditing> auditingIfAny,
+ Optional<Publishing> entityChangePublishingIfAny,
IsisConfiguration configuration,
FacetHolder holder) {
- val auditing = auditingIfAny.orElse(Auditing.AS_CONFIGURED);
+ val publish =
entityChangePublishingIfAny.orElse(Publishing.AS_CONFIGURED);
- switch (auditing) {
+ switch (publish) {
case NOT_SPECIFIED:
case AS_CONFIGURED:
@@ -49,7 +49,7 @@ public class AuditableFacetForDomainObjectAnnotation extends
AuditableFacetAbstr
case NONE:
return null;
default:
- return auditingIfAny.isPresent()
+ return entityChangePublishingIfAny.isPresent()
? new
AuditableFacetForDomainObjectAnnotationAsConfigured(holder)
: new AuditableFacetFromConfiguration(holder);
}
@@ -60,7 +60,7 @@ public class AuditableFacetForDomainObjectAnnotation extends
AuditableFacetAbstr
return new
AuditableFacetForDomainObjectAnnotation(Enablement.ENABLED, holder);
default:
- throw _Exceptions.unmatchedCase(auditing);
+ throw _Exceptions.unmatchedCase(publish);
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetForPropertyAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetForPropertyAnnotation.java
index b0f57b2..4dd56ef 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetForPropertyAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetForPropertyAnnotation.java
@@ -42,7 +42,7 @@ extends ExecutionDispatchPropertyFacetAbstract {
val publishingPolicy =
PublishingPolicies.propertyExecutionPublishingPolicy(configuration);
return propertyIfAny
- .map(Property::executionDispatch)
+ .map(Property::executionPublishing)
.filter(publishing -> publishing != Publishing.NOT_SPECIFIED)
.map(publishing -> {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
index d89b743..b549a24 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
@@ -39,14 +39,14 @@ import lombok.val;
public class Annotations_getAnnotations_on_Field_Test {
- @Property(executionDispatch = Publishing.ENABLED)
+ @Property(executionPublishing = Publishing.ENABLED)
@Inherited
@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@interface Published {
}
- @Property(executionDispatch = Publishing.DISABLED)
+ @Property(executionPublishing = Publishing.DISABLED)
@Inherited
@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@@ -64,7 +64,7 @@ public class Annotations_getAnnotations_on_Field_Test {
public void direct() throws Exception {
class SomeDomainObject {
- @Property(executionDispatch = Publishing.ENABLED)
+ @Property(executionPublishing = Publishing.ENABLED)
private String name;
public String getName() {
@@ -76,13 +76,13 @@ public class Annotations_getAnnotations_on_Field_Test {
val nearestF = _Annotations.synthesizeInherited(field, Property.class);
assertThat(nearestF.isPresent(), is(true));
- assertThat(nearestF.get().executionDispatch(), is(Publishing.ENABLED));
+ assertThat(nearestF.get().executionPublishing(),
is(Publishing.ENABLED));
val method = SomeDomainObject.class.getMethod("getName");
val nearestM = _Annotations.synthesizeInherited(method,
Property.class);
assertThat(nearestM.isPresent(), is(true));
- assertThat(nearestM.get().executionDispatch(), is(Publishing.ENABLED));
+ assertThat(nearestM.get().executionPublishing(),
is(Publishing.ENABLED));
}
@Test
@@ -100,7 +100,7 @@ public class Annotations_getAnnotations_on_Field_Test {
val nearestM = _Annotations.synthesizeInherited(method,
Property.class);
assertThat(nearestM.isPresent(), is(true));
- assertThat(nearestM.get().executionDispatch(), is(Publishing.ENABLED));
+ assertThat(nearestM.get().executionPublishing(),
is(Publishing.ENABLED));
}
@Test
@@ -118,7 +118,7 @@ public class Annotations_getAnnotations_on_Field_Test {
val nearestM = _Annotations.synthesizeInherited(method,
Property.class);
assertThat(nearestM.isPresent(), is(true));
- assertThat(nearestM.get().executionDispatch(), is(Publishing.ENABLED));
+ assertThat(nearestM.get().executionPublishing(),
is(Publishing.ENABLED));
}
@Test
@@ -137,7 +137,7 @@ public class Annotations_getAnnotations_on_Field_Test {
val nearestM = _Annotations.synthesizeInherited(method,
Property.class);
assertThat(nearestM.isPresent(), is(true));
- assertThat(nearestM.get().executionDispatch(), is(Publishing.ENABLED));
+ assertThat(nearestM.get().executionPublishing(),
is(Publishing.ENABLED));
}
@Test
@@ -156,7 +156,7 @@ public class Annotations_getAnnotations_on_Field_Test {
val nearestM = _Annotations.synthesizeInherited(method,
Property.class);
assertThat(nearestM.isPresent(), is(true));
- assertThat(nearestM.get().executionDispatch(),
is(Publishing.DISABLED));
+ assertThat(nearestM.get().executionPublishing(),
is(Publishing.DISABLED));
}
@Test
@@ -165,7 +165,7 @@ public class Annotations_getAnnotations_on_Field_Test {
class SomeDomainObject {
@MetaPublished
@Published
- @Property(executionDispatch = Publishing.DISABLED)
+ @Property(executionPublishing = Publishing.DISABLED)
private String name;
public String getName() {
return name;
@@ -176,7 +176,7 @@ public class Annotations_getAnnotations_on_Field_Test {
val nearestM = _Annotations.synthesizeInherited(method,
Property.class);
assertThat(nearestM.isPresent(), is(true));
- assertThat(nearestM.get().executionDispatch(),
is(Publishing.DISABLED));
+ assertThat(nearestM.get().executionPublishing(),
is(Publishing.DISABLED));
}
@@ -186,7 +186,7 @@ public class Annotations_getAnnotations_on_Field_Test {
class SomeDomainObject {
@MetaPublished
@NotPublished
- @Property(executionDispatch = Publishing.ENABLED)
+ @Property(executionPublishing = Publishing.ENABLED)
private String name;
public String getName() {
return name;
@@ -197,7 +197,7 @@ public class Annotations_getAnnotations_on_Field_Test {
val nearestM = _Annotations.synthesizeInherited(method,
Property.class);
assertThat(nearestM.isPresent(), is(true));
- assertThat(nearestM.get().executionDispatch(), is(Publishing.ENABLED));
+ assertThat(nearestM.get().executionPublishing(),
is(Publishing.ENABLED));
}
}
\ No newline at end of file
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 344b6c9..ac98b53 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -110,15 +110,15 @@ public class DomainObjectAnnotationFacetFactoryTest
extends AbstractFacetFactory
public static class Auditing extends
DomainObjectAnnotationFacetFactoryTest {
- @DomainObject(auditing =
org.apache.isis.applib.annotation.Auditing.AS_CONFIGURED)
+ @DomainObject(entityChangePublishing =
org.apache.isis.applib.annotation.Publishing.AS_CONFIGURED)
class CustomerWithDomainObjectAndAuditingSetToAsConfigured {
}
- @DomainObject(auditing =
org.apache.isis.applib.annotation.Auditing.DISABLED)
+ @DomainObject(entityChangePublishing =
org.apache.isis.applib.annotation.Publishing.DISABLED)
class CustomerWithDomainObjectAndAuditingSetToDisabled {
}
- @DomainObject(auditing =
org.apache.isis.applib.annotation.Auditing.ENABLED)
+ @DomainObject(entityChangePublishing =
org.apache.isis.applib.annotation.Publishing.ENABLED)
class CustomerWithDomainObjectAndAuditingSetToEnabled {
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/annotated/disabled/DomainObjectAuditingDisabledJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/annotated/disabled/DomainObjectAuditingDisabledJdo.java
index 950306b..a963c41 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/annotated/disabled/DomainObjectAuditingDisabledJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/annotated/disabled/DomainObjectAuditingDisabledJdo.java
@@ -23,11 +23,11 @@ import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
@@ -41,7 +41,7 @@ import
demoapp.dom.annotDomain.DomainObject.auditing.DomainObjectAuditingJdo;
@DomainObject(
nature=Nature.JDO_ENTITY
, objectType = "demo.DomainObjectAuditingDisabledJdo"
- , auditing = Auditing.DISABLED // <.>
+ , entityChangePublishing = Publishing.DISABLED // <.>
, bounding = Bounding.BOUNDED
)
@DomainObjectLayout(
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/annotated/enabled/DomainObjectAuditingEnabledJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/annotated/enabled/DomainObjectAuditingEnabledJdo.java
index d4923bd..8569a7b 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/annotated/enabled/DomainObjectAuditingEnabledJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/annotated/enabled/DomainObjectAuditingEnabledJdo.java
@@ -23,11 +23,11 @@ import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
@@ -41,7 +41,7 @@ import
demoapp.dom.annotDomain.DomainObject.auditing.DomainObjectAuditingJdo;
@DomainObject(
nature=Nature.JDO_ENTITY
, objectType = "demo.DomainObjectAuditingEnabledJdo"
- , auditing = Auditing.ENABLED // <.>
+ , entityChangePublishing = Publishing.ENABLED // <.>
, bounding = Bounding.BOUNDED
)
@DomainObjectLayout(
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnot/DomainObjectAuditingEnabledMetaAnnotation.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnot/DomainObjectAuditingEnabledMetaAnnotation.java
index 407e44f..27092c6 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnot/DomainObjectAuditingEnabledMetaAnnotation.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnot/DomainObjectAuditingEnabledMetaAnnotation.java
@@ -24,11 +24,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Publishing;
//tag::class[]
-@DomainObject(auditing = Auditing.ENABLED) // <.>
+@DomainObject(entityChangePublishing = Publishing.ENABLED) // <.>
@Inherited
@Target({
ElementType.TYPE, ElementType.ANNOTATION_TYPE // <.>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnotOverridden/DomainObjectAuditingDisabledMetaAnnotation.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnotOverridden/DomainObjectAuditingDisabledMetaAnnotation.java
index 65d99be..7dc5bc9 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnotOverridden/DomainObjectAuditingDisabledMetaAnnotation.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnotOverridden/DomainObjectAuditingDisabledMetaAnnotation.java
@@ -24,11 +24,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Publishing;
//tag::class[]
-@DomainObject(auditing = Auditing.DISABLED) // <.>
+@DomainObject(entityChangePublishing = Publishing.DISABLED) // <.>
@Inherited
@Target({
ElementType.TYPE, ElementType.ANNOTATION_TYPE // <.>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnotOverridden/enabled/DomainObjectAuditingEnabledMetaAnnotOverriddenJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnotOverridden/enabled/DomainObjectAuditingEnabledMetaAnnotOverriddenJdo.java
index 588641a..2c9de4e 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnotOverridden/enabled/DomainObjectAuditingEnabledMetaAnnotOverriddenJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/auditing/metaAnnotOverridden/enabled/DomainObjectAuditingEnabledMetaAnnotOverriddenJdo.java
@@ -23,11 +23,11 @@ import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
@@ -43,7 +43,7 @@ import
demoapp.dom.annotDomain.DomainObject.auditing.metaAnnotOverridden.DomainO
@DomainObject(
nature=Nature.JDO_ENTITY
, objectType = "demo.DomainObjectAuditingEnabledMetaAnnotOverriddenJdo"
- , auditing = Auditing.ENABLED // <.>
+ , entityChangePublishing = Publishing.ENABLED // <.>
, bounding = Bounding.BOUNDED
)
@DomainObjectLayout(
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchDisabledMetaAnnotation.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchDisabledMetaAnnotation.java
index 8a31b95..4e152ed 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchDisabledMetaAnnotation.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchDisabledMetaAnnotation.java
@@ -28,10 +28,10 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Publishing;
//tag::class[]
-@Property(executionDispatch = Publishing.DISABLED) // <.>
+@Property(executionPublishing = Publishing.DISABLED) // <.>
@Inherited
@Target({
- ElementType.METHOD, ElementType.FIELD // <.>
+ ElementType.METHOD, ElementType.FIELD // <.>
})
@Retention(RetentionPolicy.RUNTIME)
public @interface PropertyExecutionDispatchDisabledMetaAnnotation {
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchEnabledMetaAnnotation.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchEnabledMetaAnnotation.java
index d495603..0d1d129 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchEnabledMetaAnnotation.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchEnabledMetaAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Property;
//tag::class[]
-@Property(executionDispatch = Publishing.ENABLED) // <.>
+@Property(executionPublishing = Publishing.ENABLED) // <.>
@Inherited
@Target({
ElementType.METHOD, ElementType.FIELD // <.>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchJdo.java
index fd3b44c..a4c52f5 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionDispatch/PropertyExecutionDispatchJdo.java
@@ -63,7 +63,7 @@ public class PropertyExecutionDispatchJdo
//tag::annotation[]
@Property(
- executionDispatch = Publishing.ENABLED // <.>
+ executionPublishing = Publishing.ENABLED // <.>
)
@PropertyLayout(
describedAs =
@@ -89,7 +89,7 @@ public class PropertyExecutionDispatchJdo
//tag::meta-annotated-overridden[]
@PropertyExecutionDispatchDisabledMetaAnnotation // <.>
@Property(
- executionDispatch = Publishing.ENABLED // <.>
+ executionPublishing = Publishing.ENABLED // <.>
)
@PropertyLayout(
describedAs =
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoBook.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoBook.java
index f658c96..c904f4e 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoBook.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoBook.java
@@ -25,9 +25,9 @@ import javax.jdo.annotations.Inheritance;
import javax.jdo.annotations.InheritanceStrategy;
import javax.jdo.annotations.PersistenceCapable;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.testdomain.model.stereotypes.MyService;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
@@ -44,7 +44,7 @@ import lombok.extern.log4j.Log4j2;
@Discriminator(value="Book")
@DomainObject(
objectType = "testdomain.jdo.Book",
- auditing = Auditing.ENABLED)
+ entityChangePublishing = Publishing.ENABLED)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@ToString(callSuper = true)
@Log4j2
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoInventory.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoInventory.java
index c26ae5a..ed05b51 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoInventory.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoInventory.java
@@ -28,10 +28,10 @@ import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -44,7 +44,7 @@ import lombok.ToString;
@Version(strategy= VersionStrategy.DATE_TIME, column="version")
@DomainObject(
objectType = "testdomain.jdo.Inventory",
- auditing = Auditing.ENABLED)
+ entityChangePublishing = Publishing.ENABLED)
@DomainObjectLayout() // causes UI events to be triggered
@NoArgsConstructor @AllArgsConstructor(staticName = "of") @ToString
public class JdoInventory {
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
index 2eb8edb..066dda8 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
@@ -21,10 +21,10 @@ package org.apache.isis.testdomain.jpa.entities;
import javax.persistence.Column;
import javax.persistence.Entity;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import lombok.AccessLevel;
import lombok.Getter;
@@ -38,7 +38,7 @@ import lombok.ToString;
@DomainObject(
objectType = "testdomain.jpa.Book",
nature = Nature.JPA_ENTITY, //TODO[ISIS-2332] should not be required,
when using JPA quick classify SPI
- auditing = Auditing.ENABLED)
+ entityChangePublishing = Publishing.ENABLED)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@ToString(callSuper = true)
public class JpaBook extends JpaProduct {
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
index 8d49f05..9a29074 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
@@ -23,11 +23,11 @@ import java.util.Set;
import javax.persistence.Column;
import javax.persistence.Entity;
-import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
@@ -43,7 +43,7 @@ import lombok.ToString;
@DomainObject(
objectType = "testdomain.jdo.Inventory",
nature = Nature.JPA_ENTITY, //TODO[ISIS-2332] should not be required,
when using JPA quick classify SPI
- auditing = Auditing.ENABLED)
+ entityChangePublishing = Publishing.ENABLED)
@DomainObjectLayout() // causes UI events to be triggered
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor(staticName = "of")
