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 8cff1a5391 ISIS-3073: polishing Metamodel Terminology (3) 8cff1a5391 is described below commit 8cff1a5391f769b666f476584c6e6b92e3f548c1 Author: Andi Huber <ahu...@apache.org> AuthorDate: Wed Jun 29 10:13:56 2022 +0200 ISIS-3073: polishing Metamodel Terminology (3) --- .../resources/pages/metamodel_terminology.adoc | 52 +++++++++++----------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/antora/components/docs/modules/resources/pages/metamodel_terminology.adoc b/antora/components/docs/modules/resources/pages/metamodel_terminology.adoc index 613ebb7bde..823a9ecff1 100644 --- a/antora/components/docs/modules/resources/pages/metamodel_terminology.adoc +++ b/antora/components/docs/modules/resources/pages/metamodel_terminology.adoc @@ -12,9 +12,11 @@ skinparam nodesep 20 skinparam ranksep 1 -(Domain\nObject) as DO -(Entity) as E -(View\nModel) as VM +together { + (Domain\nObject) as DO + (Entity) as E + (View\nModel) as VM +} (<i>Apache Isis</i>) as FW (Persistence\nLayer) as PL together { @@ -24,23 +26,22 @@ together { (Service) as S (Domain\nService) as DS (<i>Spring</i>) as SPRING -(Member) as MB -(Property) as P -(Collection) as C -(Action) as A - together { - DO <-d-"is a" VM - DO <-d-"is a" E - FW .u.> VM : manages - PL .u.> E : manages + (Member) as MB + (Property) as P + (Collection) as C + (Action) as A } -together { - P "is a"-u-> MB - C "is a"-u-> MB - A "is a"-u-> MB -} +DO <-d-"is a" VM +DO <-d-"is a" E +FW .u.> VM : manages +PL .u.> E : manages + +P "is a"-u-> MB +C "is a"-u-> MB +A "is a"-u-> MB + DO --> MB : has 1..* M "contributes\n a"..> MB @@ -49,24 +50,25 @@ DO -> ME : can \n act \n as SPRING ..> S : manages DS "is a"-u-> S -DS --> A : contributes\n 1..*\n +DS --> A : has 1..* @enduml -- -*_Viewmodels_* and *_Entities_* are specializations of *_Domain-Objects_*. +*_Viewmodels_* and *_Entities_* are specializations of *_Domain Objects_*. -_Domain-Objects_ have *_Properties_*, *_Collections_* and *_Actions_*, +_Domain Objects_ have *_Properties_*, *_Collections_* and *_Actions_*, while _Viewmodels_ are (lifecycle-) managed by _Apache Isis_, _Entities_ are managed by the configured persistence layer (either JDO or JPA). -*_Services_* in general are (lifecycle-) managed by _Spring_. -We distinguish between _Services_ that *_contribute_* to the metamodel -and those that don't. Contributing _Services_ we call *_Domain-Services_*. -Those do contribute _Actions_ to the metamodel. +*_Services_* in general are (lifecycle-) managed by _Spring_. +We distinguish between _Services_ that are *_included_* in the metamodel +and those that are not. Included _Services_ we call *_Domain Services_*, +and their _Actions_ (like _Domain Objects_) are part of the metamodel. + Those _Actions_ are either visible as _Menu Actions_ in the UI and/or made available for the _Restful Objects Viewer_. (As indicated by the so called _Service's_ *_Nature_*.) -*_Mixins_* do contribute either a _Property_, a _Collection_ +*_Mixins_* do *_contribute_* either a _Property_, a _Collection_ or an _Action_ to their *_Mixee_* (-type).