Clone
danhaywood <dan@haywood-associates.co.uk>
committed
on 23 Nov 18
Merge branch 'master' into v2
# Conflicts:
# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
# adocs/docum… Show more
Merge branch 'master' into v2

# Conflicts:

#       adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc

#       adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc

#       adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_publishing.adoc

#       adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_domainEvent.adoc

#       core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java

#       core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetDefault.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPostsPropertyChangedEventAnnotation.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyAnnotation.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetForPropertyInteractionAnnotation.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java

#       core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java

Show less

master + 19 more