Skip to content

Commit

Permalink
Merge pull request #628 from ucoProject/Feature-Issue-593
Browse files Browse the repository at this point in the history
Issue 593: Remove owl:onDatatype from vocabulary definitions
  • Loading branch information
plbt5 authored Oct 16, 2024
2 parents 178efd0 + 3f0f713 commit fe4c001
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 45 deletions.
1 change: 0 additions & 1 deletion ontology/uco/core/core.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ core:ObjectStatusVocab
rdfs:label "Object Status Vocabulary"@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Draft"^^core:ObjectStatusVocab
"Final"^^core:ObjectStatusVocab
Expand Down
44 changes: 0 additions & 44 deletions ontology/uco/vocabulary/vocabulary.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ vocabulary:AccountTypeVocab
rdfs:label "Account Type Vocabulary"@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"ldap"^^vocabulary:AccountTypeVocab
"nis"^^vocabulary:AccountTypeVocab
Expand All @@ -37,7 +36,6 @@ vocabulary:ActionArgumentNameVocab
rdfs:comment "Defines an open-vocabulary for common arguments of cyber actions."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"APC Address"^^vocabulary:ActionArgumentNameVocab
"APC Mode"^^vocabulary:ActionArgumentNameVocab
Expand Down Expand Up @@ -100,7 +98,6 @@ vocabulary:ActionNameVocab
rdfs:comment "Defines an open-vocabulary of common specific cyber action names."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Accept Socket Connection"^^vocabulary:ActionNameVocab
"Add Connection to Network Share"^^vocabulary:ActionNameVocab
Expand Down Expand Up @@ -293,7 +290,6 @@ vocabulary:ActionRelationshipTypeVocab
rdfs:comment "Defines an open-vocabulary for capturing types of relationships between actions."@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Dependent_On"^^vocabulary:ActionRelationshipTypeVocab
"Equivalent_To"^^vocabulary:ActionRelationshipTypeVocab
Expand All @@ -312,7 +308,6 @@ vocabulary:ActionStatusTypeVocab
rdfs:comment "Defines an open-vocabulary of action status types."@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Complete/Finish"^^vocabulary:ActionStatusTypeVocab
"Error"^^vocabulary:ActionStatusTypeVocab
Expand All @@ -331,7 +326,6 @@ vocabulary:ActionTypeVocab
rdfs:comment "Defines an open-vocabulary of common general action types."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Accept"^^vocabulary:ActionTypeVocab
"Access"^^vocabulary:ActionTypeVocab
Expand Down Expand Up @@ -454,7 +448,6 @@ vocabulary:BitnessVocab
rdfs:comment "Defines an open-vocabulary of word sizes that define classes of operating systems."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"32"^^vocabulary:BitnessVocab
"64"^^vocabulary:BitnessVocab
Expand All @@ -468,7 +461,6 @@ vocabulary:CharacterEncodingVocab
rdfs:comment "Defines an open-vocabulary of character encodings."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"ASCII"^^vocabulary:CharacterEncodingVocab
"UTF-16"^^vocabulary:CharacterEncodingVocab
Expand All @@ -493,7 +485,6 @@ vocabulary:ContactAddressScopeVocab
rdfs:comment "Defines an open-vocabulary of scopes for address entries of digital contacts."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"home"^^vocabulary:ContactAddressScopeVocab
"work"^^vocabulary:ContactAddressScopeVocab
Expand All @@ -508,7 +499,6 @@ vocabulary:ContactEmailScopeVocab
rdfs:comment "Defines an open-vocabulary of scopes for email entries of digital contacts."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"home"^^vocabulary:ContactEmailScopeVocab
"work"^^vocabulary:ContactEmailScopeVocab
Expand All @@ -524,7 +514,6 @@ vocabulary:ContactPhoneScopeVocab
rdfs:comment "Defines an open-vocabulary of scopes for phone entries of digital contacts."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"home"^^vocabulary:ContactPhoneScopeVocab
"work"^^vocabulary:ContactPhoneScopeVocab
Expand All @@ -544,7 +533,6 @@ vocabulary:ContactSIPScopeVocab
rdfs:comment "Defines an open-vocabulary of scopes for Session Initiation Protocol (SIP) entries of digital contacts."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"home"^^vocabulary:ContactSIPScopeVocab
"work"^^vocabulary:ContactSIPScopeVocab
Expand All @@ -559,7 +547,6 @@ vocabulary:ContactURLScopeVocab
rdfs:comment "Defines an open-vocabulary of scopes for URL entries of digital contacts."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"home"^^vocabulary:ContactURLScopeVocab
"work"^^vocabulary:ContactURLScopeVocab
Expand All @@ -575,7 +562,6 @@ vocabulary:DiskTypeVocab
rdfs:comment "Defines an open-vocabulary of disk types."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"CDRom"^^vocabulary:DiskTypeVocab
"Fixed"^^vocabulary:DiskTypeVocab
Expand All @@ -592,7 +578,6 @@ vocabulary:EndiannessTypeVocab
rdfs:comment "Defines an open-vocabulary of byte ordering methods."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Big-endian"^^vocabulary:EndiannessTypeVocab
"Little-endian"^^vocabulary:EndiannessTypeVocab
Expand All @@ -607,7 +592,6 @@ vocabulary:HashNameVocab
rdfs:comment "Defines an open-vocabulary of hashing algorithm names."@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"MD5"^^vocabulary:HashNameVocab
"MD6"^^vocabulary:HashNameVocab
Expand All @@ -631,7 +615,6 @@ vocabulary:LibraryTypeVocab
rdfs:comment "Defines an open-vocabulary of library types."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Dynamic"^^vocabulary:LibraryTypeVocab
"Other"^^vocabulary:LibraryTypeVocab
Expand All @@ -648,7 +631,6 @@ vocabulary:MemoryBlockTypeVocab
rdfs:comment "Defines an open-vocabulary of types of memory blocks."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Bit-mapped"^^vocabulary:MemoryBlockTypeVocab
"Byte-mapped"^^vocabulary:MemoryBlockTypeVocab
Expand All @@ -665,7 +647,6 @@ vocabulary:ObservableObjectRelationshipVocab
rdfs:comment "Defines an open-vocabulary of inter-observable object relationships."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Allocated"^^vocabulary:ObservableObjectRelationshipVocab
"Allocated_By"^^vocabulary:ObservableObjectRelationshipVocab
Expand Down Expand Up @@ -816,7 +797,6 @@ vocabulary:ObservableObjectStateVocab
rdfs:comment "Defines an open-vocabulary of observable object states."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Active"^^vocabulary:ObservableObjectStateVocab
"Closed"^^vocabulary:ObservableObjectStateVocab
Expand All @@ -838,7 +818,6 @@ vocabulary:PartitionTypeVocab
rdfs:comment "Defines an open-vocabulary of partition types. See http://www.win.tue.nl/~aeb/partitions/partition_types-1.html for more information about the various partition types."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"PARTITION_ENTRY_UNUSED"^^vocabulary:PartitionTypeVocab
"PARTITION_EXTENDED"^^vocabulary:PartitionTypeVocab
Expand Down Expand Up @@ -869,7 +848,6 @@ vocabulary:ProcessorArchVocab
rdfs:comment "Defines an open-vocabulary of computer processor architectures."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"ARM"^^vocabulary:ProcessorArchVocab
"Alpha"^^vocabulary:ProcessorArchVocab
Expand All @@ -893,7 +871,6 @@ vocabulary:RecoveredObjectStatusVocab
rdfs:comment "Defines the vocabulary for Recovered Object status of data."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"recovered"^^vocabulary:RecoveredObjectStatusVocab
"partially recovered"^^vocabulary:RecoveredObjectStatusVocab
Expand All @@ -909,7 +886,6 @@ vocabulary:RegionalRegistryTypeVocab
rdfs:comment "Defines an open-vocabulary of Regional Internet Registries (RIRs) names, represented via their respective acronyms."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"APNIC"^^vocabulary:RegionalRegistryTypeVocab
"ARIN"^^vocabulary:RegionalRegistryTypeVocab
Expand All @@ -925,7 +901,6 @@ vocabulary:RegistryDatatypeVocab
rdfs:label "Registry Datatype Vocabulary"@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"reg_binary"^^vocabulary:RegistryDatatypeVocab
"reg_dword"^^vocabulary:RegistryDatatypeVocab
Expand All @@ -950,7 +925,6 @@ vocabulary:SIMFormVocab
rdfs:comment "Defines an open-vocabulary of common SIM card form factors."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Full-size SIM"^^vocabulary:SIMFormVocab
"Micro SIM"^^vocabulary:SIMFormVocab
Expand All @@ -965,7 +939,6 @@ vocabulary:SIMTypeVocab
rdfs:comment "Defines an open-vocabulary of common SIM card types."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"SIM"^^vocabulary:SIMTypeVocab
"UICC"^^vocabulary:SIMTypeVocab
Expand All @@ -980,7 +953,6 @@ vocabulary:TaskActionTypeVocab
rdfs:comment "Defines an open-vocabulary of task action types. See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa380596(v=vs.85).aspx."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"TASK_ACTION_COM_HANDLER"^^vocabulary:TaskActionTypeVocab
"TASK_ACTION_EXEC"^^vocabulary:TaskActionTypeVocab
Expand All @@ -996,7 +968,6 @@ vocabulary:TaskFlagVocab
rdfs:comment "Defines an open-vocabulary of the run flags for a task scheduler task. See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa381283(v=vs.85).aspx See Also: http://msdn.microsoft.com/en-us/library/microsoft.office.excel.server.addins.computecluster.taskscheduler.taskflags(v=office.12).aspx."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"TASK_FLAG_DELETE_WHEN_DONE"^^vocabulary:TaskFlagVocab
"TASK_FLAG_DISABLED"^^vocabulary:TaskFlagVocab
Expand All @@ -1021,7 +992,6 @@ vocabulary:TaskPriorityVocab
rdfs:comment "Defines an open-vocabulary of the priority levels of task scheduler tasks. See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa383512(v=vs.85).aspx."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"ABOVE_NORMAL_PRIORITY_CLASS"^^vocabulary:TaskPriorityVocab
"BELOW_NORMAL_PRIORITY_CLASS"^^vocabulary:TaskPriorityVocab
Expand All @@ -1039,7 +1009,6 @@ vocabulary:TaskStatusVocab
rdfs:comment "Defines an open-vocabulary of the possible statuses of a scheduled task. See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa383604(v=vs.85).aspx See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa381263(v=vs.85).aspx See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa381833(v=vs.85).aspx See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa383617(v=vs.85).aspx."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"SCHED_E_ACCOUNT_DBASE_CORRUPT"^^vocabulary:TaskStatusVocab
"SCHED_E_ACCOUNT_INFORMATION_NOT_SET"^^vocabulary:TaskStatusVocab
Expand Down Expand Up @@ -1075,7 +1044,6 @@ vocabulary:ThreadRunningStatusVocab
rdfs:comment "Defines an open-vocabulary of the various states that a thread may be in before, during, or after execution. See http://msdn.microsoft.com/en-us/library/system.diagnostics.threadstate(v=vs.110).aspx."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Initialized"^^vocabulary:ThreadRunningStatusVocab
"Ready"^^vocabulary:ThreadRunningStatusVocab
Expand All @@ -1095,7 +1063,6 @@ vocabulary:TimestampPrecisionVocab
rdfs:comment "Defines an open-vocabulary of timestamp precision granularities."@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"day"^^vocabulary:TimestampPrecisionVocab
"hour"^^vocabulary:TimestampPrecisionVocab
Expand All @@ -1113,7 +1080,6 @@ vocabulary:TrendVocab
rdfs:comment "Defines an open-vocabulary of trend values."@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Decreasing"^^vocabulary:TrendVocab
"Increasing"^^vocabulary:TrendVocab
Expand All @@ -1127,7 +1093,6 @@ vocabulary:TriggerFrequencyVocab
rdfs:comment "Defines an open-vocabulary of the frequency types that a trigger may use. See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa383620(v=vs.85).aspx and http://msdn.microsoft.com/en-us/library/windows/desktop/aa383987(v=vs.85).aspx."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"TASK_EVENT_TRIGGER_AT_LOGON"^^vocabulary:TriggerFrequencyVocab
"TASK_EVENT_TRIGGER_AT_SYSTEMSTART"^^vocabulary:TriggerFrequencyVocab
Expand All @@ -1147,7 +1112,6 @@ vocabulary:TriggerTypeVocab
rdfs:comment "Defines an open-vocabulary of the types of triggers associated with a task."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"TASK_TRIGGER_BOOT"^^vocabulary:TriggerTypeVocab
"TASK_TRIGGER_EVENT"^^vocabulary:TriggerTypeVocab
Expand All @@ -1166,7 +1130,6 @@ vocabulary:URLTransitionTypeVocab
rdfs:comment "Defines an open-vocabulary of types of URL transitions."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"link"^^vocabulary:URLTransitionTypeVocab
"typed"^^vocabulary:URLTransitionTypeVocab
Expand All @@ -1189,7 +1152,6 @@ vocabulary:UnixProcessStateVocab
rdfs:comment "Defines an open-vocabulary of Unix process states"@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Dead"^^vocabulary:UnixProcessStateVocab
"InterruptibleSleep"^^vocabulary:UnixProcessStateVocab
Expand All @@ -1208,7 +1170,6 @@ vocabulary:WhoisContactTypeVocab
rdfs:comment "Defines an open-vocabulary of types of registrar contacts listed in a whois entry."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"ADMIN"^^vocabulary:WhoisContactTypeVocab
"BILLING"^^vocabulary:WhoisContactTypeVocab
Expand All @@ -1223,7 +1184,6 @@ vocabulary:WhoisDNSSECTypeVocab
rdfs:comment "Defines an open-vocabulary of acceptable values for the DNSSEC field in a Whois entry."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Signed"^^vocabulary:WhoisDNSSECTypeVocab
"Unsigned"^^vocabulary:WhoisDNSSECTypeVocab
Expand All @@ -1237,7 +1197,6 @@ vocabulary:WhoisStatusTypeVocab
rdfs:comment "Defines an open-vocabulary of all valid statuses for a domain within a whois entry."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"ADD_PERIOD"^^vocabulary:WhoisStatusTypeVocab
"AUTO_RENEW_PERIOD"^^vocabulary:WhoisStatusTypeVocab
Expand Down Expand Up @@ -1268,7 +1227,6 @@ vocabulary:WindowsDriveTypeVocab
rdfs:comment "Defines an open-vocabulary of possible drive types, as enumerated by the WINAPI GetDriveType function: http://msdn.microsoft.com/en-us/library/windows/desktop/aa364939(v=vs.85).aspx."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"DRIVE_CDROM"^^vocabulary:WindowsDriveTypeVocab
"DRIVE_FIXED"^^vocabulary:WindowsDriveTypeVocab
Expand All @@ -1287,7 +1245,6 @@ vocabulary:WindowsVolumeAttributeVocab
rdfs:comment "Defines an open-vocabulary of attributes that may be returned by the diskpart attributes command: http://technet.microsoft.com/en-us/library/cc766465(v=ws.10).aspx."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"Hidden"^^vocabulary:WindowsVolumeAttributeVocab
"NoDefaultDriveLetter"^^vocabulary:WindowsVolumeAttributeVocab
Expand All @@ -1303,7 +1260,6 @@ vocabulary:WirelessNetworkSecurityModeVocab
rdfs:comment "Defines an open-vocabulary of security modes that may be configured for wireless network connections."@en ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:oneOf (
"None"^^vocabulary:WirelessNetworkSecurityModeVocab
"WEP"^^vocabulary:WirelessNetworkSecurityModeVocab
Expand Down

0 comments on commit fe4c001

Please sign in to comment.