Merge pull request #139 from casework/update_event_references

Update Event references
casework · Jan 26, 2024 · da8646d · da8646d
2 parents 8bfc252 + aa6daab
commit da8646d
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 428 deletions.
diff --git a/examples/illustrations/event/drafting.ttl b/examples/illustrations/event/drafting.ttl
diff --git a/examples/illustrations/event/event.json b/examples/illustrations/event/event.json
@@ -1,6 +1,5 @@
 {
     "@context": {
-        "drafting": "http://example.org/ontology/drafting/",
         "kb": "http://example.org/kb/",
         "uco-action": "https://ontology.unifiedcyberontology.org/uco/action/",
         "uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
@@ -13,9 +12,9 @@
     "@graph": [
         {
             "@id": "kb:event-d4a5a009-7b4d-445d-8d06-9dc85f263b3e",
-            "@type": "drafting:Event",
+            "@type": "uco-core:Event",
             "uco-core:name": "user logged in",
-            "drafting:eventType": "Authentication",
+            "uco-core:eventType": "Authentication",
             "uco-core:startTime": {
                 "@type": "xsd:dateTime",
                 "@value": "2023-07-15T17:59:43.25Z"
@@ -24,15 +23,15 @@
                 "@type": "xsd:dateTime",
                 "@value": "2023-07-15T17:59:45.33Z"
             },
-            "drafting:eventContext": [
+            "uco-core:eventContext": [
                 {
                     "@id": "kb:action-7377c5e6-6b28-4bc7-ad21-6763c070bfcc"
                 },
                 {
                     "@id": "kb:action-a86738e7-c890-4615-b3ab-deaccd3bafbb"
                 }
             ],
-            "drafting:eventAttribute": {
+            "uco-core:eventAttribute": {
                 "@id": "kb:dictionary-b222a5f4-e7eb-442a-8aab-c22c89734b9e"
             }
         },

diff --git a/examples/illustrations/spear_phishing/spear_phishing.json b/examples/illustrations/spear_phishing/spear_phishing.json
@@ -263,7 +263,7 @@
         },
         {
             "@id": "kb:DetectionEvent01",
-            "@type": "uco-core:UcoThing",
+            "@type": "uco-core:Event",
             "unmapped:hasOccurrentPart": [
                 {
                     "@id": "kb:ActOfSending02"
@@ -364,7 +364,7 @@
         },
         {
             "@id": "kb:InfectionEvent01",
-            "@type": "uco-core:UcoThing",
+            "@type": "uco-core:Event",
             "unmapped:hasOccurrentPart": [
                 {
                     "@id": "kb:ActOfMalwareDelivery01"
@@ -448,7 +448,7 @@
         },
         {
             "@id": "kb:SpearFishingEvent01",
-            "@type": "uco-core:UcoThing",
+            "@type": "uco-core:Event",
             "unmapped:hasOccurrentPart": [
                 {
                     "@id": "kb:ActOfEmailDelivery01"

diff --git a/examples/illustrations/spear_phishing/spear_phishing.ttl b/examples/illustrations/spear_phishing/spear_phishing.ttl
@@ -174,7 +174,7 @@ kb:CorporateLoggingTool01
 	.
 
 kb:DetectionEvent01
-	a uco-core:UcoThing ;
+	a uco-core:Event ;
 	unmapped:hasOccurrentPart
 		kb:ActOfEndpointScan01 ,
 		kb:ActOfFileFlagging01 ,
@@ -223,7 +223,7 @@ kb:EndpointProtectionSoftware01
 	.
 
 kb:InfectionEvent01
-	a uco-core:UcoThing ;
+	a uco-core:Event ;
 	unmapped:hasOccurrentPart
 		kb:ActOfMalwareDelivery01 ,
 		kb:ActOfMalwareInstallation01
@@ -277,7 +277,7 @@ kb:ScannerRole01
 	.
 
 kb:SpearFishingEvent01
-	a uco-core:UcoThing ;
+	a uco-core:Event ;
 	unmapped:hasOccurrentPart
 		kb:ActOfEmailDelivery01 ,
 		kb:ActOfLinkOpening01

diff --git a/examples/illustrations/spear_phishing/spear_phishing_validation-develop-2.0.0.ttl b/examples/illustrations/spear_phishing/spear_phishing_validation-develop-2.0.0.ttl
@@ -335,29 +335,6 @@
 			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
 			sh:sourceShape ep:participatesIn-shape ;
 		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode ep:DetectionEvent01 ;
-			sh:resultMessage "Focus node is not designated a subclass of UcoThing." ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraint [
-				a sh:SPARQLConstraint ;
-				sh:message "Focus node is not designated a subclass of UcoThing."@en ;
-				sh:select """
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
-			SELECT $this
-			WHERE {
-				FILTER NOT EXISTS {
-					$this a ?nClass .
-					?nClass rdfs:subClassOf+ uco-core:UcoThing .
-				}
-			}
-		""" ;
-			] ;
-			sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
-			sh:sourceShape ep:subclass-shape ;
-			sh:value ep:DetectionEvent01 ;
-		] ,
 		[
 			a sh:ValidationResult ;
 			sh:focusNode ep:DetectionEvent01 ;
@@ -421,29 +398,6 @@
 			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
 			sh:sourceShape ep:participatesIn-shape ;
 		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode ep:InfectionEvent01 ;
-			sh:resultMessage "Focus node is not designated a subclass of UcoThing." ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraint [
-				a sh:SPARQLConstraint ;
-				sh:message "Focus node is not designated a subclass of UcoThing."@en ;
-				sh:select """
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
-			SELECT $this
-			WHERE {
-				FILTER NOT EXISTS {
-					$this a ?nClass .
-					?nClass rdfs:subClassOf+ uco-core:UcoThing .
-				}
-			}
-		""" ;
-			] ;
-			sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
-			sh:sourceShape ep:subclass-shape ;
-			sh:value ep:InfectionEvent01 ;
-		] ,
 		[
 			a sh:ValidationResult ;
 			sh:focusNode ep:InfectionEvent01 ;
@@ -539,29 +493,6 @@
 			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
 			sh:sourceShape ep:realizedIn-shape ;
 		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode ep:SpearFishingEvent01 ;
-			sh:resultMessage "Focus node is not designated a subclass of UcoThing." ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraint [
-				a sh:SPARQLConstraint ;
-				sh:message "Focus node is not designated a subclass of UcoThing."@en ;
-				sh:select """
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
-			SELECT $this
-			WHERE {
-				FILTER NOT EXISTS {
-					$this a ?nClass .
-					?nClass rdfs:subClassOf+ uco-core:UcoThing .
-				}
-			}
-		""" ;
-			] ;
-			sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
-			sh:sourceShape ep:subclass-shape ;
-			sh:value ep:SpearFishingEvent01 ;
-		] ,
 		[
 			a sh:ValidationResult ;
 			sh:focusNode ep:SpearFishingEvent01 ;

diff --git a/examples/illustrations/spear_phishing/spear_phishing_validation-develop.ttl b/examples/illustrations/spear_phishing/spear_phishing_validation-develop.ttl
@@ -335,29 +335,6 @@
 			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
 			sh:sourceShape ep:participatesIn-shape ;
 		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode ep:DetectionEvent01 ;
-			sh:resultMessage "Focus node is not designated a subclass of UcoThing." ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraint [
-				a sh:SPARQLConstraint ;
-				sh:message "Focus node is not designated a subclass of UcoThing."@en ;
-				sh:select """
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
-			SELECT $this
-			WHERE {
-				FILTER NOT EXISTS {
-					$this a ?nClass .
-					?nClass rdfs:subClassOf+ uco-core:UcoThing .
-				}
-			}
-		""" ;
-			] ;
-			sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
-			sh:sourceShape ep:subclass-shape ;
-			sh:value ep:DetectionEvent01 ;
-		] ,
 		[
 			a sh:ValidationResult ;
 			sh:focusNode ep:DetectionEvent01 ;
@@ -421,29 +398,6 @@
 			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
 			sh:sourceShape ep:participatesIn-shape ;
 		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode ep:InfectionEvent01 ;
-			sh:resultMessage "Focus node is not designated a subclass of UcoThing." ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraint [
-				a sh:SPARQLConstraint ;
-				sh:message "Focus node is not designated a subclass of UcoThing."@en ;
-				sh:select """
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
-			SELECT $this
-			WHERE {
-				FILTER NOT EXISTS {
-					$this a ?nClass .
-					?nClass rdfs:subClassOf+ uco-core:UcoThing .
-				}
-			}
-		""" ;
-			] ;
-			sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
-			sh:sourceShape ep:subclass-shape ;
-			sh:value ep:InfectionEvent01 ;
-		] ,
 		[
 			a sh:ValidationResult ;
 			sh:focusNode ep:InfectionEvent01 ;
@@ -539,29 +493,6 @@
 			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
 			sh:sourceShape ep:realizedIn-shape ;
 		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode ep:SpearFishingEvent01 ;
-			sh:resultMessage "Focus node is not designated a subclass of UcoThing." ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraint [
-				a sh:SPARQLConstraint ;
-				sh:message "Focus node is not designated a subclass of UcoThing."@en ;
-				sh:select """
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
-			SELECT $this
-			WHERE {
-				FILTER NOT EXISTS {
-					$this a ?nClass .
-					?nClass rdfs:subClassOf+ uco-core:UcoThing .
-				}
-			}
-		""" ;
-			] ;
-			sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
-			sh:sourceShape ep:subclass-shape ;
-			sh:value ep:SpearFishingEvent01 ;
-		] ,
 		[
 			a sh:ValidationResult ;
 			sh:focusNode ep:SpearFishingEvent01 ;