From d5ad31fb9cd4a466514103175888083dc7c32923 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 9 Nov 2023 09:21:19 -0500 Subject: [PATCH 1/2] Designate ObservablePattern a subclass of Pattern, adding namespace import This patch also has the Observable namespace import the Pattern namespace, to attain first access to the Pattern class. No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/543 Signed-off-by: Alex Nelson --- ontology/uco/observable/observable.ttl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ontology/uco/observable/observable.ttl b/ontology/uco/observable/observable.ttl index 050119f..1479291 100644 --- a/ontology/uco/observable/observable.ttl +++ b/ontology/uco/observable/observable.ttl @@ -3,6 +3,7 @@ # imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/identity/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/location/1.2.0 +# imports: https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/types/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0 @@ -14,6 +15,7 @@ @prefix location: . @prefix observable: . @prefix owl: . +@prefix pattern: . @prefix rdf: . @prefix rdfs: . @prefix sh: . @@ -31,6 +33,7 @@ core:1.2.0 , identity:1.2.0 , location:1.2.0 , + pattern:1.2.0 , types:1.2.0 , vocabulary:1.2.0 ; @@ -5038,7 +5041,10 @@ observable:ObservablePattern owl:Class , sh:NodeShape ; - rdfs:subClassOf observable:Observable ; + rdfs:subClassOf + observable:Observable , + pattern:Pattern + ; rdfs:label "ObservablePattern"@en ; rdfs:comment "An observable pattern is a grouping of characteristics unique to a logical pattern composed of observable object and observable action properties."@en ; sh:targetClass observable:ObservablePattern ; From 885acb56a318b2c5c7c8601b485117393aecb7fb Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 9 Nov 2023 13:16:25 -0500 Subject: [PATCH 2/2] Revert direct Pattern namespace import The previous patch included a direct Pattern namespace import. This turns out to not be necessary because the Pattern namespace is already in the transitive `owl:imports` closure, via the Action namespace. Hence, the `Pattern` class is already available for `ObservablePattern`. I realized this when I noticed the `catalog-v001.xml` file didn't require an update from adding the direct import. References: * https://github.com/ucoProject/UCO/issues/543 Signed-off-by: Alex Nelson --- ontology/uco/observable/observable.ttl | 2 -- 1 file changed, 2 deletions(-) diff --git a/ontology/uco/observable/observable.ttl b/ontology/uco/observable/observable.ttl index 1479291..2da20c1 100644 --- a/ontology/uco/observable/observable.ttl +++ b/ontology/uco/observable/observable.ttl @@ -3,7 +3,6 @@ # imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/identity/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/location/1.2.0 -# imports: https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/types/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0 @@ -33,7 +32,6 @@ core:1.2.0 , identity:1.2.0 , location:1.2.0 , - pattern:1.2.0 , types:1.2.0 , vocabulary:1.2.0 ;