Update turnstile for software changes

ge-high-assurance · Jan 8, 2021 · 1171c00 · 1171c00
1 parent 182d048
commit 1171c00
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 381 deletions.
diff --git a/RACK-Ontology/OwlModels/FILE.owl b/RACK-Ontology/OwlModels/FILE.owl
@@ -76,7 +76,7 @@
     <rdfs:domain rdf:resource="#FILE_HASH"/>
     <rdfs:range rdf:resource="#HASH_TYPE"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:ID="fileParent">
+  <owl:ObjectProperty rdf:ID="definedIn">
     <rdfs:comment xml:lang="en">The file an ENTITY is defined in</rdfs:comment>
     <rdfs:range rdf:resource="#FILE"/>
     <rdfs:domain rdf:resource="PROV-S#ENTITY"/>

diff --git a/RACK-Ontology/ontology/FILE.sadl b/RACK-Ontology/ontology/FILE.sadl
@@ -13,7 +13,7 @@
 uri "http://arcos.rack/FILE" alias file.
 import "http://arcos.rack/PROV-S".
 
-fileParent (note "The file an ENTITY is defined in") describes ENTITY with values of type FILE.
+definedIn (note "The file an ENTITY is defined in") describes ENTITY with values of type FILE.
 
 FILE
     (note "A file in the system")

diff --git a/Turnstile-Ontology/02-Software/03-Implementation/CounterApplication.sadl b/Turnstile-Ontology/02-Software/03-Implementation/CounterApplication.sadl
@@ -50,7 +50,6 @@ input_o is a ObjectFile
 
 input_function is a SWCOMPONENT
     has identifier "input_function"
-    has dataInsertedBy Mockup
     has componentType SOURCE_FUNCTION
     has title "input"
     has valueType "void()"
@@ -88,7 +87,6 @@ output_o is a ObjectFile
 
 output_function is a SWCOMPONENT
     has identifier "output_function"
-    has dataInsertedBy Mockup
     has componentType SOURCE_FUNCTION
     has title "output"
     has valueType "void()"