Merge branch 'develop' into Feature-Issue-393

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "dependencies/collections-ontology"]
 	path = dependencies/collections-ontology
 	url = https://github.com/collections-ontology/collections-ontology.git
+[submodule "dependencies/error"]
+	path = dependencies/error
+	url = https://github.com/SPAROntologies/error.git

Makefile

@@ -38,7 +38,7 @@ check: \
   .git_submodule_init.done.log \
   .lib.done.log
 	$(MAKE) \
-	  --directory ontology/uco \
+	  --directory ontology \
 	  check
 	$(MAKE) \
 	  --directory tests \
@@ -53,7 +53,7 @@ clean: \
 
 clean-ontology:
 	@$(MAKE) \
-	  --directory ontology/uco \
+	  --directory ontology \
 	  clean
 
 clean-tests:

ontology/Makefile

@@ -33,6 +33,7 @@ all-co:
 
 all-uco:
 	$(MAKE) \
+	  --directory uco
 
 check: \
   check-co \

ontology/co/co.ttl

@@ -1,3 +1,5 @@
+# imports: http://purl.org/co
+
 @prefix co: <http://purl.org/co/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -8,8 +10,8 @@
 
 <https://ontology.unifiedcyberontology.org/co>
 	a owl:Ontology ;
-	owl:imports <http://purl.org/co> ;
 	rdfs:comment "This ontology defines SHACL shapes to supplement the OWL 2 DL definitions in the Collections Ontology."@en ;
+	owl:imports <http://purl.org/co> ;
 	.
 
 co:ListItem
@@ -35,15 +37,6 @@ uco-co:ListItem-shape
 	sh:targetClass co:ListItem ;
 	.
 
-uco-co:firstItem-subjects-shape
-	a sh:PropertyShape ;
-	sh:class co:ListItem ;
-	sh:maxCount "1"^^xsd:integer ;
-	sh:nodeKind sh:BlankNodeOrIRI ;
-	sh:path co:firstItem ;
-	sh:targetSubjectsOf co:firstItem ;
-	.
-
 uco-co:firstItem-subjects-previousItem-shape
 	a sh:PropertyShape ;
 	sh:description "The first item in a list must not have a previous item."@en ;
@@ -55,6 +48,15 @@ uco-co:firstItem-subjects-previousItem-shape
 	sh:targetSubjectsOf co:firstItem ;
 	.
 
+uco-co:firstItem-subjects-shape
+	a sh:PropertyShape ;
+	sh:class co:ListItem ;
+	sh:maxCount "1"^^xsd:integer ;
+	sh:nodeKind sh:BlankNodeOrIRI ;
+	sh:path co:firstItem ;
+	sh:targetSubjectsOf co:firstItem ;
+	.
+
 uco-co:followedBy-subjects-shape
 	a sh:PropertyShape ;
 	sh:class co:Item ;
@@ -83,9 +85,9 @@ uco-co:item-subjects-shape
 uco-co:itemContent-subjects-shape
 	a sh:NodeShape ;
 	sh:not [
-		sh:description "This shape encodes in SHACL that the range of co:itemContent is the complement of co:Item."@en ;
 		a sh:PropertyShape ;
 		sh:class co:Item ;
+		sh:description "This shape encodes in SHACL that the range of co:itemContent is the complement of co:Item."@en ;
 		sh:path co:itemContent ;
 	] ;
 	sh:property [
@@ -146,9 +148,9 @@ uco-co:size-subjects-shape
 
 []
 	a owl:Axiom ;
+	rdfs:comment "This triple is repeated from the Collections Ontology."@en ;
 	owl:AnnotatedProperty rdfs:subClassOf ;
 	owl:AnnotatedSource co:ListItem ;
 	owl:AnnotatedTarget co:Item ;
-	rdfs:comment "This triple is repeated from the Collections Ontology."@en ;
 	.
 

ontology/uco/master/uco.ttl

@@ -1,3 +1,4 @@
+# imports: https://ontology.unifiedcyberontology.org/co
 # imports: https://ontology.unifiedcyberontology.org/uco/action
 # imports: https://ontology.unifiedcyberontology.org/uco/core
 # imports: https://ontology.unifiedcyberontology.org/uco/identity
@@ -24,6 +25,7 @@
 	a owl:Ontology ;
 	rdfs:label "uco-master"@en ;
 	owl:imports
+		<https://ontology.unifiedcyberontology.org/co> ,
 		<https://ontology.unifiedcyberontology.org/uco/action> ,
 		<https://ontology.unifiedcyberontology.org/uco/core> ,
 		<https://ontology.unifiedcyberontology.org/uco/identity> ,

ontology/uco/observable/observable.ttl

@@ -2655,12 +2655,24 @@ observable:EventFacet
 			sh:nodeKind sh:BlankNodeOrIRI ;
 			sh:path observable:application ;
 		] ,
+		[
+			sh:datatype xsd:dateTime ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path observable:endTime ;
+		] ,
 		[
 			sh:datatype xsd:dateTime ;
 			sh:maxCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
 			sh:path observable:observableCreatedTime ;
 		] ,
+		[
+			sh:datatype xsd:dateTime ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path observable:startTime ;
+		] ,
 		[
 			sh:datatype xsd:string ;
 			sh:maxCount "1"^^xsd:integer ;
@@ -5062,6 +5074,17 @@ observable:ProcessFacet
 	sh:targetClass observable:ProcessFacet ;
 	.
 
+observable:ProcessThread
+	a
+		owl:Class ,
+		sh:NodeShape
+		;
+	rdfs:subClassOf observable:ObservableObject ;
+	rdfs:label "ProcessThread"@en ;
+	rdfs:comment "A process thread is the smallest sequence of programmed instructions that can be managed independently by a scheduler on a computer, which is typically a part of the operating system. It is a component of a process. Multiple threads can exist within one process, executing concurrently and sharing resources such as memory, while different processes do not share these resources. In particular, the threads of a process share its executable code and the values of its dynamically allocated variables and non-thread-local global variables at any given time. [based on https://en.wikipedia.org/wiki/Thread_(computing)]"@en ;
+	sh:targetClass observable:ProcessThread ;
+	.
+
 observable:Profile
 	a
 		owl:Class ,
@@ -5810,17 +5833,6 @@ observable:TaskActionType
 	sh:targetClass observable:TaskActionType ;
 	.
 
-observable:Thread
-	a
-		owl:Class ,
-		sh:NodeShape
-		;
-	rdfs:subClassOf observable:ObservableObject ;
-	rdfs:label "Thread"@en ;
-	rdfs:comment "A thread is the smallest sequence of programmed instructions that can be managed independently by a scheduler on a computer, which is typically a part of the operating system. It is a component of a process. Multiple threads can exist within one process, executing concurrently and sharing resources such as memory, while different processes do not share these resources. In particular, the threads of a process share its executable code and the values of its dynamically allocated variables and non-thread-local global variables at any given time. [based on https://en.wikipedia.org/wiki/Thread_(computing)]"@en ;
-	sh:targetClass observable:Thread ;
-	.
-
 observable:TriggerType
 	a
 		owl:Class ,
@@ -8068,7 +8080,7 @@ observable:WindowsThread
 		owl:Class ,
 		sh:NodeShape
 		;
-	rdfs:subClassOf observable:Thread ;
+	rdfs:subClassOf observable:ProcessThread ;
 	rdfs:label "WindowsThread"@en ;
 	rdfs:comment "A Windows thread is a single thread of execution within a Windows process."@en ;
 	sh:targetClass observable:WindowsThread ;