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 2021/01/19 08:42:26 UTC
[isis] 01/01: Merge branch 'ISIS-439'
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1de6276ed60382451eeebb8530b80788d3d563af
Merge: d2e48ba af676ff
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 19 07:18:32 2021 +0000
Merge branch 'ISIS-439'
.../modules/ROOT/pages/cutting-a-release.adoc | 2 +-
.../modules/ROOT/pages/key-generation.adoc | 4 +-
.../comguide/modules/ROOT/pages/pmc-notes.adoc | 10 +-
.../ROOT/pages/post-release-successful.adoc | 4 +-
.../ROOT/pages/post-release-unsuccessful.adoc | 2 +-
.../modules/ROOT/pages/verifying-releases.adoc | 6 +-
.../pages/what-is-apache-isis/screencasts.adoc | 2 +-
.../resources/partials/plantuml-stereotypes.puml | 2 +-
.../2.0.0-M1/mignotes/removed-annotations.adoc | 4 +-
.../2.0.0-M1/mignotes/updated-annotations.adoc | 7 +-
.../pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc | 6 +
.../modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc | 43 +-
.../modules/eclipse/attachments/isis-templates.xml | 110 +-
.../modules/intellij/pages/hints-and-tips.adoc | 4 +-
.../pages/index/applib/annotation/Collection.adoc | 16 -
.../pages/index/applib/annotation/MemberOrder.adoc | 4 +-
.../pages/index/applib/annotation/Property.adoc | 4 +-
.../pages/index/applib/annotation/Where.adoc | 2 +-
.../applib/services/grid/GridSystemService.adoc | 2 +-
.../index/applib/services/iactn/Interaction.adoc | 2 +-
.../index/applib/services/sudo/SudoService.adoc | 2 +-
.../jdo/applib/integration/JdoSupportService.adoc | 6 +-
antora/supplemental-ui/schema/ixn/ixn-1.0.xsd | 2 +-
antora/supplemental-ui/schema/ixn/ixn-1.1.xsd | 4 +-
antora/supplemental-ui/schema/ixn/ixn-1.2.xsd | 4 +-
antora/supplemental-ui/schema/ixn/ixn-1.3.xsd | 2 +-
antora/supplemental-ui/schema/ixn/ixn-2.0.xsd | 2 +-
antora/supplemental-ui/schema/ixn/ixn.xsd | 2 +-
api/adoc/userguide/modules/ROOT/pages/about.adoc | 2 +-
.../btb/pages/programming-model/finetuning.adoc | 6 +-
.../fun/pages/concepts-patterns/core-values.adoc | 2 +-
.../fun/pages/concepts-patterns/metamodel.adoc | 2 +-
.../modules/fun/pages/object-members.adoc | 6 +-
.../modules/fun/pages/object-members/actions.adoc | 4 +-
.../fun/pages/object-members/collections.adoc | 4 +-
api/adoc/userguide/modules/fun/pages/overview.adoc | 2 +-
.../modules/fun/pages/overview/business-rules.adoc | 8 +-
.../modules/fun/pages/overview/modules.adoc | 2 +-
.../modules/fun/pages/overview/object-members.adoc | 14 +-
api/adoc/userguide/modules/fun/pages/ui.adoc | 2 +-
.../modules/fun/pages/ui/action-icons-and-css.adoc | 6 +-
.../fun/pages/ui/names-and-descriptions.adoc | 2 +-
.../modules/fun/pages/ui/object-layout.adoc | 16 +-
.../fun/pages/ui/object-titles-and-icons.adoc | 4 +-
.../userguide/modules/fun/pages/view-models.adoc | 3 +-
.../modules/fun/pages/view-models/UNUSED-dto.adoc | 2 +-
.../userguide/modules/fun/partials/module-nav.adoc | 2 +-
.../applib-ant/examples/annotation/Collection.java | 21 -
.../adoc/modules/applib-ant/pages/Collection.adoc | 9 -
.../applib-ant/pages/Collection/editing.adoc | 63 -
.../modules/applib-ant/pages/DomainObject.adoc | 2 +-
.../adoc/modules/applib-ant/pages/MemberOrder.adoc | 6 +-
.../applib-ant/pages/MemberOrder/sequence.adoc | 2 +-
.../pages/ParameterLayout/describedAs.adoc | 2 +-
.../adoc/modules/applib-ant/pages/Property.adoc | 4 +-
.../modules/applib-ant/pages/Property/editing.adoc | 1 -
.../{mementoSerialization.adoc => snapshot.adoc} | 11 +-
.../adoc/modules/applib-ant/pages/about/main.adoc | 4 +-
.../adoc/modules/applib-ant/pages/about/other.adoc | 2 +-
.../adoc/modules/applib-ant/pages/view-models.adoc | 6 +-
.../applib-classes/pages/layout/object-layout.adoc | 4 +-
.../roles-mixins-contributees/mixins/Dto.adoc | 6 +-
.../pages/utility/ObjectContracts.adoc | 2 +-
.../modules/applib-methods/pages/prefixes.adoc | 2 +-
.../pages/reserved/deprecated/disable.adoc | 4 +-
.../pages/reserved/deprecated/hide.adoc | 6 +-
.../pages/ApplicationFeatureRepository.adoc | 2 +-
.../modules/applib-svc/pages/EventBusService.adoc | 4 +-
.../adoc/modules/applib-svc/pages/GridService.adoc | 6 +-
.../applib-svc/pages/GridSystemService.adoc | 8 +-
.../modules/applib-svc/pages/LayoutService.adoc | 4 +-
.../modules/applib-svc/pages/MetaModelService.adoc | 2 +-
.../modules/applib-svc/partials/_metadata-api.adoc | 2 +-
.../apache/isis/applib/annotation/Collection.java | 10 +-
.../apache/isis/applib/annotation/Property.java | 10 +-
.../{MementoSerialization.java => Snapshot.java} | 19 +-
.../isis/applib/domain/DomainObjectList.java | 3 +-
.../src/main/adoc/modules/schema/pages/mml.adoc | 4 +-
.../org/apache/isis/schema/ixn/ixn-2.0.xsd | 2 +-
.../pages/sections/isis.viewer.restfulobjects.adoc | 24 +-
.../CollectionAnnotationFacetFactory.java | 13 +-
.../DisabledFacetForCollectionAnnotation.java | 69 -
...ExcludeFacet.java => SnapshotExcludeFacet.java} | 2 +-
...ract.java => SnapshotExcludeFacetAbstract.java} | 6 +-
.../property/PropertyAnnotationFacetFactory.java | 4 +-
...SnapshotExcludeFacetForPropertyAnnotation.java} | 18 +-
.../update/PropertySetAndClearFacetFactory.java | 2 +-
...rred.java => SnapshotExcludeFacetInferred.java} | 6 +-
.../spec/feature/OneToOneAssociation.java | 4 +-
.../specimpl/OneToManyAssociationMixedIn.java | 8 +-
.../core/metamodel/util/snapshot/XmlSnapshot.java | 3 +
.../CollectionAnnotationFacetFactoryTest.java | 59 +-
...bledAnnotationOnCollectionFacetFactoryTest.java | 82 --
.../PropertyMethodsFacetFactoryTest.java | 12 +-
...sistedAnnotationOnPropertyFacetFactoryTest.java | 12 +-
.../PropertyAnnotationFacetFactoryTest.java | 14 +-
.../specimpl/OneToOneAssociationAbstractTest.java | 6 +-
.../pages/RepresentationService.adoc | 2 +-
doxygen.cfg | 1318 ++++++++++----------
.../HasAsciiDocDescription_description.java | 4 +-
.../HasAsciiDocDescription_sources.java | 4 +-
.../child/ActionAssociateWithVm-description.adoc | 2 +-
.../dom/annotDomain/Action/restrictTo/.gitkeep | 0
.../dom/annotDomain/Action/semantics/.gitkeep | 0
.../dom/annotDomain/Collection/editing/.gitkeep | 0
.../dom/annotDomain/Property/PropertyMenu.java | 15 +-
...PropertyMementoSerializationVm-description.adoc | 135 --
.../snapshot/PropertySnapshotVm-description.adoc | 111 ++
.../PropertySnapshotVm.java} | 51 +-
.../PropertySnapshotVm.layout.xml} | 5 +-
.../PropertySnapshotVm_takeXmlSnapshot.java} | 41 +-
.../SnapshotExcludedMetaAnnotation.java} | 10 +-
.../SnapshotIncludedMetaAnnotation.java} | 10 +-
.../src/main/java/demoapp/dom/menubars.layout.xml | 2 +-
.../demoapp/dom/services/core/ServicesMenu.java | 9 +-
.../XmlSnapshotParentVm-description.adoc | 148 +--
.../xmlSnapshotService/XmlSnapshotParentVm.java | 21 +-
.../XmlSnapshotParentVm_takeSnapshot.java | 104 --
.../XmlSnapshotParentVm_takeXmlSnapshot.java | 102 ++
.../child/XmlSnapshotChildVm-description.adoc | 2 +-
.../peer/XmlSnapshotPeerVm-description.adoc | 2 +-
.../xmlSnapshotService/peer/XmlSnapshotPeerVm.java | 18 +
.../peer/XmlSnapshotPeerVm.layout.xml | 13 +-
.../XmlSnapshotPeerChildVm-description.adoc} | 2 +-
.../XmlSnapshotPeerChildVm.java} | 10 +-
.../XmlSnapshotPeerChildVm.layout.xml} | 0
.../src/main/resources/static/css/application.css | 6 +-
.../secman/jdo/dom/role/ApplicationRole.java | 7 +-
.../secman/jdo/dom/tenancy/ApplicationTenancy.java | 3 +-
.../secman/jdo/dom/user/ApplicationUser.java | 7 +-
.../src/main/adoc/modules/bypass/pages/about.adoc | 2 +-
.../applib/services/clobs/RTF-Spec-1.7.rtf | 2 +-
.../fakedata/applib/services/clobs/a_and_c.xml | 2 +-
.../fakedata/applib/services/clobs/coriolan.xml | 10 +-
.../fakedata/applib/services/clobs/hen_iv_2.xml | 2 +-
.../fakedata/applib/services/clobs/hen_vi_1.xml | 2 +-
.../fakedata/applib/services/clobs/m_for_m.xml | 2 +-
.../fakedata/applib/services/clobs/othello.xml | 2 +-
.../adoc/modules/integtestsupport/pages/about.adoc | 2 +-
.../adoc/modules/ROOT/pages/layout-resources.adoc | 4 +-
.../adoc/modules/ROOT/pages/ro-spec.adoc | 8 +-
.../pages/customisation/tweaking-css-classes.adoc | 4 +-
.../adoc/modules/ROOT/partials/security/pages.adoc | 4 +-
143 files changed, 1378 insertions(+), 1758 deletions(-)