From 8a989742ca32c5ef46dbee115675f8605fd033c1 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Tue, 29 Oct 2024 16:55:03 -0400 Subject: [PATCH] refactor some entity defs and add Security Domain class --- .../003-Classes/00003-Relationship.yaml | 48 --------------- .../003-Classes/00010-Method.yaml | 58 ++++++++++++++++++- .../00030-BuildAttributeMethod.yaml | 1 + .../003-Classes/02229-Domain.yaml | 19 ++++++ 4 files changed, 77 insertions(+), 49 deletions(-) create mode 100644 mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02229-Domain.yaml diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00003-Relationship.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00003-Relationship.yaml index 96acfb2..5170381 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00003-Relationship.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00003-Relationship.yaml @@ -146,54 +146,6 @@ # siblingRelationshipId: '&IDR_Element__has_text_node_value__Attribute;' # singular: yes - - relationship: '&IDR_Class__has__Method;' - index: 15 - sourceClassId: '&IDC_Class;' - type: 'has' - destinationClassId: '&IDC_Method;' - siblingRelationshipId: '&IDR_Method__for__Class;' - singular: no - - - relationship: '&IDR_Method__for__Class;' - index: 16 - sourceClassId: '&IDC_Method;' - type: 'for' - destinationClassId: '&IDC_Class;' - siblingRelationshipId: '&IDR_Class__has__Method;' - singular: no - - # - relationship: '&IDR_Class__has_implementation__Method;' - # index: 17, - # sourceClassId: '&IDC_Class;' - # type: 'has implementation' - # destinationClassId: '&IDC_Method;' - # siblingRelationshipId: '&IDR_Method__implements_for__Class;' - # singular: no - - # - relationship: '&IDR_Method__implements_for__Class;' - # index: 18, - # sourceClassId: '&IDC_Method;' - # type: 'implements for' - # destinationClassId: '&IDC_Class;' - # siblingRelationshipId: '&IDR_Class__has_implementation__Method;' - # singular: yes - - # - relationship: '&IDR_Method__implements__Method;' - # index: 19 - # sourceClassId: '&IDC_Method;' - # type: 'implements' - # destinationClassId: '&IDC_Method;' - # siblingRelationshipId: '&IDR_Method__implemented_by__Method;' - # singular: no - - # - relationship: '&IDR_Method__implemented_by__Method;' - # index: 20, - # sourceClassId: '&IDC_Method;' - # type: 'implemented by' - # destinationClassId: '&IDC_Method;' - # siblingRelationshipId: '&IDR_Method__implements__Method;' - # singular: no - - relationship: '&IDR_Class__has_default__Task;' index: 87 sourceClassId: '&IDC_Class;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00010-Method.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00010-Method.yaml index 16722c0..0ae95b3 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00010-Method.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00010-Method.yaml @@ -1,4 +1,10 @@ --- +- entityDefinitions: + - IDR_Class__has_implementation__Method: '{b453349c-e977-445d-967c-aed566d92eb3}' + - IDR_Method__implements_for__Class: '{155e95b8-9c34-451c-9b93-31aaf3d3da1d}' + - IDR_Method__implements__Method: '{83c992d7-03ec-483f-b6f1-225083f201e3}' + - IDR_Method__implemented_by__Method: '{f19e7779-a6b6-4914-a5cc-3c48fa1c9491}' + - library: '&IDL_MochaBaseSystem;' instances: - class: '&IDC_Method;' @@ -17,4 +23,54 @@ - instance: '&IDR_Metadata_With_Access_Modifier__has__Access_Modifier;' customTagName: 'accessModifierId' - instance: '&IDR_Instance__for__Module;' - customTagName: 'moduleId' \ No newline at end of file + customTagName: 'moduleId' + - instance: '&IDR_Method__implements__Method;' + customTagName: 'implementsMethodId' + + - relationship: '&IDR_Class__has__Method;' + index: 15 + sourceClassId: '&IDC_Class;' + type: 'has' + destinationClassId: '&IDC_Method;' + siblingRelationshipId: '&IDR_Method__for__Class;' + singular: no + + - relationship: '&IDR_Method__for__Class;' + index: 16 + sourceClassId: '&IDC_Method;' + type: 'for' + destinationClassId: '&IDC_Class;' + siblingRelationshipId: '&IDR_Class__has__Method;' + singular: no + + - relationship: '&IDR_Class__has_implementation__Method;' + index: 17 + sourceClassId: '&IDC_Class;' + type: 'has implementation' + destinationClassId: '&IDC_Method;' + siblingRelationshipId: '&IDR_Method__implements_for__Class;' + singular: no + + - relationship: '&IDR_Method__implements_for__Class;' + index: 18 + sourceClassId: '&IDC_Method;' + type: 'implements for' + destinationClassId: '&IDC_Class;' + siblingRelationshipId: '&IDR_Class__has_implementation__Method;' + singular: yes + + - relationship: '&IDR_Method__implements__Method;' + index: 19 + sourceClassId: '&IDC_Method;' + type: 'implements' + destinationClassId: '&IDC_Method;' + siblingRelationshipId: '&IDR_Method__implemented_by__Method;' + singular: no + + - relationship: '&IDR_Method__implemented_by__Method;' + index: 20 + sourceClassId: '&IDC_Method;' + type: 'implemented by' + destinationClassId: '&IDC_Method;' + siblingRelationshipId: '&IDR_Method__implements__Method;' + singular: no \ No newline at end of file diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00030-BuildAttributeMethod.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00030-BuildAttributeMethod.yaml index 9a6aa23..1ae4f25 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00030-BuildAttributeMethod.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00030-BuildAttributeMethod.yaml @@ -55,6 +55,7 @@ - class: '&IDC_BuildAttributeMethodComponent;' name: 'Build Attribute Method Component' + index: 32 # was : Class Marker registerForTemplate: yes attributes: - instance: '&IDA_Order;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02229-Domain.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02229-Domain.yaml new file mode 100644 index 0000000..f5c2729 --- /dev/null +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02229-Domain.yaml @@ -0,0 +1,19 @@ +- entityDefinitions: + - IDC_SecurityDomain: '{d7c57aad-e658-424a-a9f0-0d3e494904d0}' + - IDI_SecurityDomain_Anyone: '{7c420ec0-988b-4987-89f6-004df29d7e6b}' + - IDI_SecurityDomain_AuthenticatedUsers: '{f9d4f21d-2b2b-4002-b99d-7b30d4e67c6d}' + +- library: '&IDL_MochaBaseSystem;' + instances: + - class: '&IDC_SecurityDomain;' + name: Domain + index: 2229 + customTagName: 'securityDomain' + attributes: + - instance: '&IDA_Name;' + customTagName: 'name' + + - securityDomain: '&IDI_SecurityDomain_Anyone;' + name: 'Anyone' + - securityDomain: '&IDI_SecurityDomain_AuthenticatedUsers;' + name: 'Authenticated Users' \ No newline at end of file