Merge pull request #409 from ge-high-assurance/revert-404-Prop-definedIn

Revert "Changed and moved definedIn property."
ge-high-assurance · May 25, 2021 · 620b89d · 620b89d
2 parents d40a07f + c5dda1e
commit 620b89d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/RACK-Ontology/OwlModels/FILE.owl b/RACK-Ontology/OwlModels/FILE.owl
@@ -95,6 +95,11 @@
     <rdfs:comment xml:lang="en">Hash algorithm</rdfs:comment>
     <rdfs:range rdf:resource="#HASH_TYPE"/>
   </owl:ObjectProperty>
+  <owl:ObjectProperty rdf:ID="definedIn">
+    <rdfs:comment xml:lang="en">The file a THING is defined or contained in</rdfs:comment>
+    <rdfs:range rdf:resource="#FILE"/>
+    <rdfs:domain rdf:resource="PROV-S#THING"/>
+  </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#createBy">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasGeneratedBy"/>
     <rdfs:comment xml:lang="en">FILE_CREATION ACTIVITY that created this file</rdfs:comment>

diff --git a/RACK-Ontology/OwlModels/PROV-S.owl b/RACK-Ontology/OwlModels/PROV-S.owl
@@ -135,11 +135,6 @@
     <rdfs:range rdf:resource="#ACTIVITY"/>
     <rdfs:domain rdf:resource="#ENTITY"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:ID="definedIn">
-    <rdfs:comment xml:lang="en">The ENTITY (or its representation information) is defined or contained in an ENTITY, such as a FILE</rdfs:comment>
-    <rdfs:range rdf:resource="#ENTITY"/>
-    <rdfs:domain rdf:resource="#ENTITY"/>
-  </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="wasInformedBy">
     <rdfs:comment xml:lang="en">a Communication, the exchange of some unspecified entity by two activities, one activity using some entity generated by the other.</rdfs:comment>
     <rdfs:range rdf:resource="#ACTIVITY"/>

diff --git a/RACK-Ontology/ontology/FILE.sadl b/RACK-Ontology/ontology/FILE.sadl
@@ -16,13 +16,15 @@
   * dwa - 11 Nov 2020 - removed incorrect use of wasDerivedFrom
   * dwa - 11 Nov 2020 - removed createBy in favor of base class wasGeneratedBy
   * dwa - 11 Nov 2020 - removed FILE_CREATION activity as unnecessary
-  * am - 19 May2021 - definedIn property is altered and moved to PROV-S.sadl
+  *
   *********************************************/
 
 
 uri "http://arcos.rack/FILE" alias file.
 import "http://arcos.rack/PROV-S".
 
+definedIn (note "The file a THING is defined or contained in") describes THING with values of type FILE.
+
 FILE
 	(note "A file in a filesystem")
 	is a type of ENTITY.

diff --git a/RACK-Ontology/ontology/PROV-S.sadl b/RACK-Ontology/ontology/PROV-S.sadl
@@ -32,7 +32,6 @@ THING (note "A piece of data stored in RACK") is a class.
 ENTITY (note "An entity is a physical, digital, conceptual, or other kind of thing with some fixed aspects; entities may be real or imaginary.")
 	is a type of THING.
 
-    definedIn (note "The ENTITY (or its representation information) is defined or contained in an ENTITY, such as a FILE") describes ENTITY with values of type ENTITY.
 	wasDerivedFrom (note "A derivation is a transformation of an entity into another, an update of an entity resulting in a new one, or the construction of a new entity based on a pre-existing entity.") describes ENTITY with values of type ENTITY.
 	wasRevisionOf (note "Indicates a direct line of primary descendancy from one entity to a derivative entity.") describes ENTITY with values of type ENTITY.
 	wasRevisionOf is a type of wasDerivedFrom.