Skip to content

Commit

Permalink
Move ObjectStatusVocab into core namesapce
Browse files Browse the repository at this point in the history
This follows a committee decision to keep core as a namespace with no
import-dependencies.

No effects were observed on Make-managed files.

References:
* #549

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
  • Loading branch information
ajnelson-nist committed Aug 9, 2024
1 parent 1db08e8 commit 70a1975
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 22 deletions.
29 changes: 21 additions & 8 deletions ontology/uco/core/core.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix sh: <http://www.w3.org/ns/shacl#> .
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

<https://ontology.unifiedcyberontology.org/uco/core>
Expand Down Expand Up @@ -318,6 +317,20 @@ core:ModusOperandi
sh:targetClass core:ModusOperandi ;
.

core:ObjectStatusVocab
a rdfs:Datatype ;
rdfs:label "Object Status Vocabulary"@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Draft"^^core:ObjectStatusVocab
"Final"^^core:ObjectStatusVocab
"Deprecated"^^core:ObjectStatusVocab
) ;
] ;
.

core:Relationship
a
owl:Class ,
Expand Down Expand Up @@ -454,7 +467,7 @@ core:UcoObject
sh:path core:tag ;
] ,
[
sh:datatype vocabulary:ObjectStatusVocab ;
sh:datatype core:ObjectStatusVocab ;
sh:message "Value is outside the default vocabulary ObjectStatusVocab." ;
sh:path core:objectStatus ;
sh:severity sh:Info ;
Expand All @@ -464,7 +477,7 @@ core:UcoObject
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocabulary:ObjectStatusVocab ;
sh:datatype core:ObjectStatusVocab ;
]
[
sh:datatype xsd:string ;
Expand All @@ -476,11 +489,11 @@ core:UcoObject
sh:message "Value is not member of the vocabulary ObjectStatusVocab." ;
sh:or (
[
sh:datatype vocabulary:ObjectStatusVocab ;
sh:datatype core:ObjectStatusVocab ;
sh:in (
"Draft"^^vocabulary:ObjectStatusVocab
"Final"^^vocabulary:ObjectStatusVocab
"Deprecated"^^vocabulary:ObjectStatusVocab
"Draft"^^core:ObjectStatusVocab
"Final"^^core:ObjectStatusVocab
"Deprecated"^^core:ObjectStatusVocab
) ;
]
[
Expand Down Expand Up @@ -742,7 +755,7 @@ core:objectStatus
a rdfs:Datatype ;
owl:unionOf (
xsd:string
vocabulary:ObjectStatusVocab
core:ObjectStatusVocab
) ;
] ;
.
Expand Down
14 changes: 0 additions & 14 deletions ontology/uco/vocabulary/vocabulary.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -659,20 +659,6 @@ vocabulary:MemoryBlockTypeVocab
] ;
.

vocabulary:ObjectStatusVocab
a rdfs:Datatype ;
rdfs:label "Object Status Vocabulary"@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Draft"^^vocabulary:ObjectStatusVocab
"Final"^^vocabulary:ObjectStatusVocab
"Deprecated"^^vocabulary:ObjectStatusVocab
) ;
] ;
.

vocabulary:ObservableObjectRelationshipVocab
a rdfs:Datatype ;
rdfs:label "Cyber Item Relationship Vocabulary"@en-US ;
Expand Down

0 comments on commit 70a1975

Please sign in to comment.