From 07608ffb50bd319965d3e326445260924dea3da5 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 11 Sep 2024 13:35:32 -0400 Subject: [PATCH 01/15] Bump unstable pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/593 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index d84aa3c4..8ec77c16 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit d84aa3c42e90d714f887ca2bce4415ea3c39c8e0 +Subproject commit 8ec77c16e68790a6eceea47b7e17258e9ad83646 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 88251494..9f12d5e6 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 88251494564176573e9297798ef22c3753202c95 +Subproject commit 9f12d5e65d9dba5b1e1dc6acacde112f5252a43b From 74573a77ca14a7e42e407192a96744b8ef63384d Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 11 Sep 2024 13:51:55 -0400 Subject: [PATCH 02/15] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/593 Signed-off-by: Alex Nelson --- ontology/CASE-unstable-2.0.0.ttl | 44 -------------------------------- ontology/CASE-unstable.ttl | 44 -------------------------------- 2 files changed, 88 deletions(-) diff --git a/ontology/CASE-unstable-2.0.0.ttl b/ontology/CASE-unstable-2.0.0.ttl index afcd5a48..ab0283d0 100644 --- a/ontology/CASE-unstable-2.0.0.ttl +++ b/ontology/CASE-unstable-2.0.0.ttl @@ -18919,7 +18919,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 @@ -18939,7 +18938,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 @@ -19002,7 +19000,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 @@ -19195,7 +19192,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 @@ -19214,7 +19210,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 @@ -19233,7 +19228,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 @@ -19356,7 +19350,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 @@ -19370,7 +19363,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 @@ -19395,7 +19387,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 @@ -19410,7 +19401,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 @@ -19426,7 +19416,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 @@ -19446,7 +19435,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 @@ -19461,7 +19449,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 @@ -19477,7 +19464,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 @@ -19494,7 +19480,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 @@ -19509,7 +19494,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 @@ -19533,7 +19517,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 @@ -19550,7 +19533,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 @@ -19567,7 +19549,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 @@ -19718,7 +19699,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 @@ -19740,7 +19720,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 @@ -19771,7 +19750,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 @@ -19795,7 +19773,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 @@ -19811,7 +19788,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 @@ -19827,7 +19803,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 @@ -19852,7 +19827,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 @@ -19867,7 +19841,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 @@ -19882,7 +19855,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 @@ -19898,7 +19870,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 @@ -19923,7 +19894,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 @@ -19941,7 +19911,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 @@ -19977,7 +19946,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 @@ -19997,7 +19965,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 @@ -20015,7 +19982,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 @@ -20029,7 +19995,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 @@ -20049,7 +20014,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 @@ -20068,7 +20032,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 @@ -20091,7 +20054,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 @@ -20110,7 +20072,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 @@ -20125,7 +20086,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 @@ -20139,7 +20099,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 @@ -20170,7 +20129,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 @@ -20189,7 +20147,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 @@ -20205,7 +20162,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 diff --git a/ontology/CASE-unstable.ttl b/ontology/CASE-unstable.ttl index c90d0657..195456bf 100644 --- a/ontology/CASE-unstable.ttl +++ b/ontology/CASE-unstable.ttl @@ -18922,7 +18922,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 @@ -18942,7 +18941,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 @@ -19005,7 +19003,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 @@ -19198,7 +19195,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 @@ -19217,7 +19213,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 @@ -19236,7 +19231,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 @@ -19359,7 +19353,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 @@ -19373,7 +19366,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 @@ -19398,7 +19390,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 @@ -19413,7 +19404,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 @@ -19429,7 +19419,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 @@ -19449,7 +19438,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 @@ -19464,7 +19452,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 @@ -19480,7 +19467,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 @@ -19497,7 +19483,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 @@ -19512,7 +19497,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 @@ -19536,7 +19520,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 @@ -19553,7 +19536,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 @@ -19570,7 +19552,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 @@ -19721,7 +19702,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 @@ -19743,7 +19723,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 @@ -19774,7 +19753,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 @@ -19798,7 +19776,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 @@ -19814,7 +19791,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 @@ -19830,7 +19806,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 @@ -19855,7 +19830,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 @@ -19870,7 +19844,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 @@ -19885,7 +19858,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 @@ -19901,7 +19873,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 @@ -19926,7 +19897,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 @@ -19944,7 +19914,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 @@ -19980,7 +19949,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 @@ -20000,7 +19968,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 @@ -20018,7 +19985,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 @@ -20032,7 +19998,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 @@ -20052,7 +20017,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 @@ -20071,7 +20035,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 @@ -20094,7 +20057,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 @@ -20113,7 +20075,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 @@ -20128,7 +20089,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 @@ -20142,7 +20102,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 @@ -20173,7 +20132,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 @@ -20192,7 +20150,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 @@ -20208,7 +20165,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 From de5fc7f77835f527099ee272afb3f7997d65a084 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 11 Sep 2024 13:56:25 -0400 Subject: [PATCH 03/15] Bump unstable pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/593 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 8ec77c16..5c608e48 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 8ec77c16e68790a6eceea47b7e17258e9ad83646 +Subproject commit 5c608e482fb924f2aefb0d68e8201ab245c4e638 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 9f12d5e6..5c2925cb 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 9f12d5e65d9dba5b1e1dc6acacde112f5252a43b +Subproject commit 5c2925cb70396bd969746b56a42a1d52f98c248b From 54077b66b5874f765938851cc5cd6942c9ea8b97 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 11 Sep 2024 14:14:14 -0400 Subject: [PATCH 04/15] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/593 Signed-off-by: Alex Nelson --- ontology/CASE-unstable-2.0.0.ttl | 1 - ontology/CASE-unstable.ttl | 1 - 2 files changed, 2 deletions(-) diff --git a/ontology/CASE-unstable-2.0.0.ttl b/ontology/CASE-unstable-2.0.0.ttl index ab0283d0..eb1dcc23 100644 --- a/ontology/CASE-unstable-2.0.0.ttl +++ b/ontology/CASE-unstable-2.0.0.ttl @@ -636,7 +636,6 @@ vocab:InvestigationFormVocab rdfs:comment "Defines an open-vocabulary of investigation forms."@en-US ; owl:equivalentClass [ a rdfs:Datatype ; - owl:onDatatype xsd:string ; owl:oneOf ( "case"^^vocab:InvestigationFormVocab "incident"^^vocab:InvestigationFormVocab diff --git a/ontology/CASE-unstable.ttl b/ontology/CASE-unstable.ttl index 195456bf..59497dc1 100644 --- a/ontology/CASE-unstable.ttl +++ b/ontology/CASE-unstable.ttl @@ -636,7 +636,6 @@ vocab:InvestigationFormVocab rdfs:comment "Defines an open-vocabulary of investigation forms."@en-US ; owl:equivalentClass [ a rdfs:Datatype ; - owl:onDatatype xsd:string ; owl:oneOf ( "case"^^vocab:InvestigationFormVocab "incident"^^vocab:InvestigationFormVocab From a049764df60697472785a33b9160aab9a092a9ac Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 11 Sep 2024 14:40:02 -0400 Subject: [PATCH 05/15] Bump prerelease pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/549 Signed-off-by: Alex Nelson --- dependencies/CASE-develop | 2 +- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies/CASE-develop b/dependencies/CASE-develop index b93add73..8ba59291 160000 --- a/dependencies/CASE-develop +++ b/dependencies/CASE-develop @@ -1 +1 @@ -Subproject commit b93add730a2b8f35e370ab438a9a9d5feb9d90c1 +Subproject commit 8ba59291af9c22816af02faa8f2f760e8235ab95 diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 5c608e48..c1046b02 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 5c608e482fb924f2aefb0d68e8201ab245c4e638 +Subproject commit c1046b0217f1bb9120d17bd7da855e500173dafc diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 5c2925cb..e9b21ea9 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 5c2925cb70396bd969746b56a42a1d52f98c248b +Subproject commit e9b21ea951515dbda7e85137bcbed27080684603 From 4496d7d716e8ca470dcbe42fd223a0e6878cd9a4 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 11 Sep 2024 14:46:53 -0400 Subject: [PATCH 06/15] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/549 Signed-off-by: Alex Nelson --- ontology/CASE-develop.ttl | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/ontology/CASE-develop.ttl b/ontology/CASE-develop.ttl index 9df37c0a..fcdf04d7 100644 --- a/ontology/CASE-develop.ttl +++ b/ontology/CASE-develop.ttl @@ -2367,6 +2367,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 , @@ -2501,6 +2515,17 @@ core:UcoObject sh:datatype xsd:string ; sh:nodeKind sh:Literal ; sh:path core:tag ; + ] , + [ + sh:datatype core:ObjectStatusVocab ; + sh:in ( + "Draft"^^core:ObjectStatusVocab + "Final"^^core:ObjectStatusVocab + "Deprecated"^^core:ObjectStatusVocab + ) ; + sh:maxCount "1"^^xsd:integer ; + sh:nodeKind sh:Literal ; + sh:path core:objectStatus ; ] ; sh:targetClass core:UcoObject ; @@ -2747,6 +2772,19 @@ core:objectMarking rdfs:range core:MarkingDefinitionAbstraction ; . +core:objectStatus + a owl:AnnotationProperty ; + rdfs:label "objectStatus"@en ; + rdfs:comment "The current state of formality and acceptance for a UCO object."@en-US ; + rdfs:range core:ObjectStatusVocab ; + . + +core:objectStatus-subjects-shape + a sh:NodeShape ; + sh:class core:UcoObject ; + sh:targetSubjectsOf core:objectStatus ; + . + core:referenceURL a owl:DatatypeProperty ; rdfs:label "referenceURL"@en ; From 7fcde0eb55e9391ae72714aad0c6bf46066bacda Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 11 Sep 2024 14:53:00 -0400 Subject: [PATCH 07/15] Bump unstable pointers No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/612 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index c1046b02..692d3187 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit c1046b0217f1bb9120d17bd7da855e500173dafc +Subproject commit 692d3187026c31dacab1a538b0d1da443060bdb3 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index e9b21ea9..9c34bcf2 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit e9b21ea951515dbda7e85137bcbed27080684603 +Subproject commit 9c34bcf2782a419fd37c139a0b3af7149bafd6be From 2b33da98d74936ac79b6dd50ad787d0ca5825bc6 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 09:24:06 -0400 Subject: [PATCH 08/15] Bump unstable pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/593 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 692d3187..d8cce95c 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 692d3187026c31dacab1a538b0d1da443060bdb3 +Subproject commit d8cce95c945152dd71ba58b8c8ff36d8b1a922bb diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 9c34bcf2..a45b405b 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 9c34bcf2782a419fd37c139a0b3af7149bafd6be +Subproject commit a45b405ba488ed87ce496088a1b0a987035021b4 From 8bad53ec0a1d11b9baf9a0b08774ae789c670e7a Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 10:04:42 -0400 Subject: [PATCH 09/15] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/549 * https://github.com/ucoProject/UCO/issues/593 Signed-off-by: Alex Nelson --- ontology/CASE-unstable-2.0.0.ttl | 1 - ontology/CASE-unstable.ttl | 1 - 2 files changed, 2 deletions(-) diff --git a/ontology/CASE-unstable-2.0.0.ttl b/ontology/CASE-unstable-2.0.0.ttl index eb1dcc23..ec74ca15 100644 --- a/ontology/CASE-unstable-2.0.0.ttl +++ b/ontology/CASE-unstable-2.0.0.ttl @@ -2835,7 +2835,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 diff --git a/ontology/CASE-unstable.ttl b/ontology/CASE-unstable.ttl index 59497dc1..bd310b93 100644 --- a/ontology/CASE-unstable.ttl +++ b/ontology/CASE-unstable.ttl @@ -2796,7 +2796,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 From 190872afef50470ab00d01c5c3c72bd6cb1e2ac0 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 11:02:54 -0400 Subject: [PATCH 10/15] Bump prerelease pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/612 Signed-off-by: Alex Nelson --- dependencies/CASE-develop | 2 +- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies/CASE-develop b/dependencies/CASE-develop index 8ba59291..8a353f8e 160000 --- a/dependencies/CASE-develop +++ b/dependencies/CASE-develop @@ -1 +1 @@ -Subproject commit 8ba59291af9c22816af02faa8f2f760e8235ab95 +Subproject commit 8a353f8ebb7669203146315690c12dd958702cc3 diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index d8cce95c..453aa5df 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit d8cce95c945152dd71ba58b8c8ff36d8b1a922bb +Subproject commit 453aa5dfa1e7a10d666f93ec4797a8f64157c815 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index a45b405b..80587ce1 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit a45b405ba488ed87ce496088a1b0a987035021b4 +Subproject commit 80587ce1d9b711005e14e43262915e6c5578f98a From 7e40d7cb8be7c32d17f25bcaa40dc6245ccf5e61 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 11:06:31 -0400 Subject: [PATCH 11/15] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/612 Signed-off-by: Alex Nelson --- ontology/CASE-develop.ttl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ontology/CASE-develop.ttl b/ontology/CASE-develop.ttl index fcdf04d7..135d0e27 100644 --- a/ontology/CASE-develop.ttl +++ b/ontology/CASE-develop.ttl @@ -5974,6 +5974,14 @@ observable:Disk rdfs:subClassOf observable:ObservableObject ; rdfs:label "Disk"@en ; rdfs:comment "A disk is a storage mechanism where data is recorded by various electronic, magnetic, optical, or mechanical changes to a surface layer of one or more rotating disks."@en ; + rdfs:seeAlso [ + a sh:NodeShape ; + rdfs:comment "This anonymous shape is attached with rdfs:seeAlso in order to associate a warning-severity class constraint, that will only be necessary as an independent shape until UCO 2.0.0."@en ; + sh:class observable:StorageMedium ; + sh:message "In UCO 2.0.0, uco-observable:Disk will be a subclass of uco-observable:StorageMedium. In preparation for UCO 2.0.0, the additional type uco-observable:StorageMedium should be assigned to this node."@en ; + sh:severity sh:Warning ; + sh:targetClass observable:Disk ; + ] ; sh:targetClass observable:Disk ; . From ff32f1d9c2da6b9731573a2ca8e65a980fff15dd Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 17:27:01 -0400 Subject: [PATCH 12/15] Bump unstable pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 453aa5df..8c55711c 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 453aa5dfa1e7a10d666f93ec4797a8f64157c815 +Subproject commit 8c55711c38bd0652e844a24cf54b92a846ce9f76 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 80587ce1..552c756a 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 80587ce1d9b711005e14e43262915e6c5578f98a +Subproject commit 552c756a5f8a034d243693217b9236f39ea8b146 From d45c080b636c3cc3825c3f94e6736310998b4b13 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 17:29:57 -0400 Subject: [PATCH 13/15] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- .../asgard_validation-unstable-2.0.0.ttl | 60 +++++++++++++----- .../asgard/asgard_validation-unstable.ttl | 62 ++++++++++++++----- ...rossover_wmd_validation-unstable-2.0.0.ttl | 28 ++++++++- .../crossover_wmd_validation-unstable.ttl | 30 ++++++++- ..._trafficking_validation-unstable-2.0.0.ttl | 60 +++++++++++++----- .../owl_trafficking_validation-unstable.ttl | 62 ++++++++++++++----- ontology/CASE-unstable-2.0.0.ttl | 20 +++--- ontology/CASE-unstable.ttl | 12 ++++ 8 files changed, 257 insertions(+), 77 deletions(-) diff --git a/examples/asgard/asgard_validation-unstable-2.0.0.ttl b/examples/asgard/asgard_validation-unstable-2.0.0.ttl index cf20dece..50974538 100644 --- a/examples/asgard/asgard_validation-unstable-2.0.0.ttl +++ b/examples/asgard/asgard_validation-unstable-2.0.0.ttl @@ -8,21 +8,49 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; - sh:result [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; - sh:resultPath uco-observable:accountType ; - sh:resultSeverity sh:Info ; - sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; - sh:sourceShape [ - sh:datatype vocabulary:AccountTypeVocab ; - sh:message "Value is outside the default vocabulary AccountTypeVocab." ; - sh:path uco-observable:accountType ; - sh:severity sh:Info ; - ] ; - sh:value "Phone" ; - ] ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; + sh:resultPath uco-observable:accountType ; + sh:resultSeverity sh:Info ; + sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; + sh:sourceShape [ + sh:datatype vocabulary:AccountTypeVocab ; + sh:message "Value is outside the default vocabulary AccountTypeVocab." ; + sh:path uco-observable:accountType ; + sh:severity sh:Info ; + ] ; + sh:value "Phone" ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:manufacturer ; + sh:resultSeverity sh:Violation ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:manufacturer ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:version ; + sh:resultSeverity sh:Violation ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:version ; + ] ; + ] + ; . diff --git a/examples/asgard/asgard_validation-unstable.ttl b/examples/asgard/asgard_validation-unstable.ttl index cf20dece..37c35c15 100644 --- a/examples/asgard/asgard_validation-unstable.ttl +++ b/examples/asgard/asgard_validation-unstable.ttl @@ -8,21 +8,51 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; - sh:result [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; - sh:resultPath uco-observable:accountType ; - sh:resultSeverity sh:Info ; - sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; - sh:sourceShape [ - sh:datatype vocabulary:AccountTypeVocab ; - sh:message "Value is outside the default vocabulary AccountTypeVocab." ; - sh:path uco-observable:accountType ; - sh:severity sh:Info ; - ] ; - sh:value "Phone" ; - ] ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; + sh:resultPath uco-observable:accountType ; + sh:resultSeverity sh:Info ; + sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; + sh:sourceShape [ + sh:datatype vocabulary:AccountTypeVocab ; + sh:message "Value is outside the default vocabulary AccountTypeVocab." ; + sh:path uco-observable:accountType ; + sh:severity sh:Info ; + ] ; + sh:value "Phone" ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:version ; + sh:severity sh:Warning ; + ] ; + ] + ; . diff --git a/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl b/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl index 20af041e..f684449a 100644 --- a/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl +++ b/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl @@ -8,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -39,6 +39,32 @@ sh:severity sh:Info ; ] ; sh:value "Phone" ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:manufacturer ; + sh:resultSeverity sh:Violation ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:manufacturer ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:version ; + sh:resultSeverity sh:Violation ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:version ; + ] ; ] ; . diff --git a/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl b/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl index 20af041e..2baf33ff 100644 --- a/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl +++ b/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl @@ -8,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -39,6 +39,34 @@ sh:severity sh:Info ; ] ; sh:value "Phone" ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:version ; + sh:severity sh:Warning ; + ] ; ] ; . diff --git a/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl b/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl index 13c0538e..2ea64b45 100644 --- a/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl +++ b/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl @@ -8,21 +8,49 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; - sh:result [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; - sh:resultPath uco-observable:accountType ; - sh:resultSeverity sh:Info ; - sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; - sh:sourceShape [ - sh:datatype vocabulary:AccountTypeVocab ; - sh:message "Value is outside the default vocabulary AccountTypeVocab." ; - sh:path uco-observable:accountType ; - sh:severity sh:Info ; - ] ; - sh:value "phone" ; - ] ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; + sh:resultPath uco-observable:accountType ; + sh:resultSeverity sh:Info ; + sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; + sh:sourceShape [ + sh:datatype vocabulary:AccountTypeVocab ; + sh:message "Value is outside the default vocabulary AccountTypeVocab." ; + sh:path uco-observable:accountType ; + sh:severity sh:Info ; + ] ; + sh:value "phone" ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:manufacturer ; + sh:resultSeverity sh:Violation ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:manufacturer ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:version ; + sh:resultSeverity sh:Violation ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:version ; + ] ; + ] + ; . diff --git a/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl b/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl index 13c0538e..678fd90b 100644 --- a/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl +++ b/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl @@ -8,21 +8,51 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; - sh:result [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; - sh:resultPath uco-observable:accountType ; - sh:resultSeverity sh:Info ; - sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; - sh:sourceShape [ - sh:datatype vocabulary:AccountTypeVocab ; - sh:message "Value is outside the default vocabulary AccountTypeVocab." ; - sh:path uco-observable:accountType ; - sh:severity sh:Info ; - ] ; - sh:value "phone" ; - ] ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; + sh:resultPath uco-observable:accountType ; + sh:resultSeverity sh:Info ; + sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; + sh:sourceShape [ + sh:datatype vocabulary:AccountTypeVocab ; + sh:message "Value is outside the default vocabulary AccountTypeVocab." ; + sh:path uco-observable:accountType ; + sh:severity sh:Info ; + ] ; + sh:value "phone" ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath uco-observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path uco-observable:version ; + sh:severity sh:Warning ; + ] ; + ] + ; . diff --git a/ontology/CASE-unstable-2.0.0.ttl b/ontology/CASE-unstable-2.0.0.ttl index ec74ca15..418212f6 100644 --- a/ontology/CASE-unstable-2.0.0.ttl +++ b/ontology/CASE-unstable-2.0.0.ttl @@ -9234,12 +9234,6 @@ observable:OperatingSystemFacet rdfs:label "OperatingSystemFacet"@en ; rdfs:comment "An operating system facet is a grouping of characteristics unique to the software that manages computer hardware, software resources, and provides common services for computer programs. [based on https://en.wikipedia.org/wiki/Operating_system]"@en ; sh:property - [ - sh:class identity:Identity ; - sh:maxCount "1"^^xsd:integer ; - sh:nodeKind sh:IRI ; - sh:path observable:manufacturer ; - ] , [ sh:class types:Dictionary ; sh:maxCount "1"^^xsd:integer ; @@ -9266,14 +9260,18 @@ observable:OperatingSystemFacet ] , [ sh:datatype xsd:string ; - sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:version ; + sh:path observable:advertisingID ; ] , [ - sh:datatype xsd:string ; - sh:nodeKind sh:Literal ; - sh:path observable:advertisingID ; + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + ] , + [ + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; ] ; sh:targetClass observable:OperatingSystemFacet ; diff --git a/ontology/CASE-unstable.ttl b/ontology/CASE-unstable.ttl index bd310b93..5390c2f6 100644 --- a/ontology/CASE-unstable.ttl +++ b/ontology/CASE-unstable.ttl @@ -9245,6 +9245,18 @@ observable:OperatingSystemFacet sh:datatype xsd:string ; sh:nodeKind sh:Literal ; sh:path observable:advertisingID ; + ] , + [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] , + [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; ] ; sh:targetClass observable:OperatingSystemFacet ; From 73d429d6f7404392df0c46dfa83e32b4d4f713aa Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 17:58:20 -0400 Subject: [PATCH 14/15] Migrate software properties of operating systems into new objects; add relationships and provenance A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- examples/asgard/src/asgard-1.json | 49 +++++++++++++++---- ...ossover_wmd-android_device_properties.json | 45 +++++++++++++---- .../src/crossover_wmd-data_extraction.json | 14 ++++-- .../src/owl_trafficking-02.json | 6 +++ .../src/owl_trafficking-03.json | 45 +++++++++++++---- 5 files changed, 127 insertions(+), 32 deletions(-) diff --git a/examples/asgard/src/asgard-1.json b/examples/asgard/src/asgard-1.json index 2018ac36..de5c4953 100644 --- a/examples/asgard/src/asgard-1.json +++ b/examples/asgard/src/asgard-1.json @@ -23,6 +23,12 @@ }, { "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4" } ] }, @@ -34,6 +40,12 @@ "uco-core:object": [ { "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4" } ] }, @@ -81,15 +93,6 @@ "drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774", "drafting:ownerName": "Loki iPhone" }, - { - "@id": "kb:operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "iOS", - "uco-observable:manufacturer": { - "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" - }, - "uco-observable:version": "10.3" - }, { "@id": "kb:wifi-address-facet-27d5903b-0037-4a98-acad-4f5003461899", "@type": "uco-observable:WifiAddressFacet", @@ -102,6 +105,34 @@ } ] }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "iOS", + "uco-core:hasFacet": { + "@id": "kb:software-facet-fbedb8fd-0b1c-4470-a8dd-14612514bd56", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" + }, + "uco-observable:version": "10.3" + } + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4", + "@type": "uco-observable:ObservableRelationship", + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:isDirectional": true, + "uco-core:source": { + "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + "uco-core:target": { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + } + }, { "@id": "kb:mobileaccount-74b4e46a-bee3-48f7-a5db-a6178d92aa90", "@type": "uco-observable:MobileAccount", diff --git a/examples/crossover_wmd/src/crossover_wmd-android_device_properties.json b/examples/crossover_wmd/src/crossover_wmd-android_device_properties.json index f3fc527f..5d60f5f5 100644 --- a/examples/crossover_wmd/src/crossover_wmd-android_device_properties.json +++ b/examples/crossover_wmd/src/crossover_wmd-android_device_properties.json @@ -40,16 +40,6 @@ ], "uco-observable:IMEI": "356420075722843" }, - { - "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" - }, - "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259", - "uco-observable:version": "6.0.1" - }, { "@id": "kb:wifi-address-facet-047a5278-1e8a-4e38-b2f6-1b77894624b8", "@type": "uco-observable:WifiAddressFacet", @@ -62,6 +52,41 @@ } ] }, + { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Android", + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259" + }, + { + "@id": "kb:software-facet-da02e9c9-b35b-42e7-bbc8-013b15e17803", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" + }, + "uco-observable:version": "6.0.1" + } + ] + }, + { + "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" + }, + "uco-core:target": { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d" + } + }, { "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec", "@type": "uco-identity:Organization", diff --git a/examples/crossover_wmd/src/crossover_wmd-data_extraction.json b/examples/crossover_wmd/src/crossover_wmd-data_extraction.json index cb10ced4..fc01cc09 100644 --- a/examples/crossover_wmd/src/crossover_wmd-data_extraction.json +++ b/examples/crossover_wmd/src/crossover_wmd-data_extraction.json @@ -85,8 +85,16 @@ { "@id": "kb:provenancerecord-9326149a-31c5-4d20-ada3-b97743d3e563", "@type": "case-investigation:ProvenanceRecord", - "uco-core:object": { - "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" - } + "uco-core:object": [ + { + "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" + }, + { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d" + }, + { + "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d" + } + ] } ] diff --git a/examples/owl_trafficking/src/owl_trafficking-02.json b/examples/owl_trafficking/src/owl_trafficking-02.json index ec806dc2..f75a062e 100644 --- a/examples/owl_trafficking/src/owl_trafficking-02.json +++ b/examples/owl_trafficking/src/owl_trafficking-02.json @@ -16,6 +16,12 @@ "uco-core:object": [ { "@id": "kb:lge-device-eee670c6-01d4-4e42-bb6b-ebeca149b168" + }, + { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137" + }, + { + "@id": "kb:relationship-b41ecf43-d68c-440e-a8ae-b5978ebcbf98" } ] }, diff --git a/examples/owl_trafficking/src/owl_trafficking-03.json b/examples/owl_trafficking/src/owl_trafficking-03.json index 7bc56f14..16d1fc42 100644 --- a/examples/owl_trafficking/src/owl_trafficking-03.json +++ b/examples/owl_trafficking/src/owl_trafficking-03.json @@ -51,16 +51,6 @@ }, "uco-observable:storageCapacityInBytes": 31268536320 }, - { - "@id": "kb:operating-system-facet-478dc553-2d39-45ff-8974-d3d1b8df7c75", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-lge-e7ae1d96-e054-44b5-9943-8da6515e8332" - }, - "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259", - "uco-observable:version": "6.0.1" - }, { "@id": "kb:wifi-address-facet-57724dcb-18f7-4913-a659-64ca79336107", "@type": "uco-observable:WifiAddressFacet", @@ -73,6 +63,41 @@ } ] }, + { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Android", + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-478dc553-2d39-45ff-8974-d3d1b8df7c75", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259" + }, + { + "@id": "kb:software-facet-a3cd613c-1c35-4f0e-8983-a4720121fa9e", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-lge-e7ae1d96-e054-44b5-9943-8da6515e8332" + }, + "uco-observable:version": "6.0.1" + } + ] + }, + { + "@id": "kb:relationship-b41ecf43-d68c-440e-a8ae-b5978ebcbf98", + "@type": "uco-observable:ObservableRelationship", + "uco-core:source": { + "@id": "kb:lge-device-eee670c6-01d4-4e42-bb6b-ebeca149b168" + }, + "uco-core:target": { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137" + }, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:isDirectional": true + }, { "@id": "kb:relationship-6d7a7a20-ca70-4f7f-994d-c2db39e08545", "@type": "uco-core:Relationship", From 3799583c836205fcb1563459c5af0e35c9cde1be Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 18:08:37 -0400 Subject: [PATCH 15/15] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- examples/asgard/asgard.json | 49 ++++++++++++--- .../asgard_validation-unstable-2.0.0.ttl | 60 +++++------------- .../asgard/asgard_validation-unstable.ttl | 62 +++++-------------- examples/asgard/index.html | 49 ++++++++++++--- examples/crossover_wmd/crossover_wmd.json | 59 ++++++++++++++---- ...rossover_wmd_validation-unstable-2.0.0.ttl | 28 +-------- .../crossover_wmd_validation-unstable.ttl | 30 +-------- examples/crossover_wmd/index.html | 59 ++++++++++++++---- examples/owl_trafficking/index.html | 51 ++++++++++++--- examples/owl_trafficking/owl_trafficking.json | 51 ++++++++++++--- ..._trafficking_validation-unstable-2.0.0.ttl | 60 +++++------------- .../owl_trafficking_validation-unstable.ttl | 62 +++++-------------- 12 files changed, 320 insertions(+), 300 deletions(-) diff --git a/examples/asgard/asgard.json b/examples/asgard/asgard.json index 0ef4c7ed..443be2c0 100644 --- a/examples/asgard/asgard.json +++ b/examples/asgard/asgard.json @@ -101,6 +101,12 @@ }, { "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4" } ] }, @@ -112,6 +118,12 @@ "uco-core:object": [ { "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4" } ] }, @@ -159,15 +171,6 @@ "drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774", "drafting:ownerName": "Loki iPhone" }, - { - "@id": "kb:operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "iOS", - "uco-observable:manufacturer": { - "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" - }, - "uco-observable:version": "10.3" - }, { "@id": "kb:wifi-address-facet-27d5903b-0037-4a98-acad-4f5003461899", "@type": "uco-observable:WifiAddressFacet", @@ -180,6 +183,34 @@ } ] }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "iOS", + "uco-core:hasFacet": { + "@id": "kb:software-facet-fbedb8fd-0b1c-4470-a8dd-14612514bd56", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" + }, + "uco-observable:version": "10.3" + } + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4", + "@type": "uco-observable:ObservableRelationship", + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:isDirectional": true, + "uco-core:source": { + "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + "uco-core:target": { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + } + }, { "@id": "kb:mobileaccount-74b4e46a-bee3-48f7-a5db-a6178d92aa90", "@type": "uco-observable:MobileAccount", diff --git a/examples/asgard/asgard_validation-unstable-2.0.0.ttl b/examples/asgard/asgard_validation-unstable-2.0.0.ttl index 50974538..cf20dece 100644 --- a/examples/asgard/asgard_validation-unstable-2.0.0.ttl +++ b/examples/asgard/asgard_validation-unstable-2.0.0.ttl @@ -8,49 +8,21 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; - sh:resultPath uco-observable:accountType ; - sh:resultSeverity sh:Info ; - sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; - sh:sourceShape [ - sh:datatype vocabulary:AccountTypeVocab ; - sh:message "Value is outside the default vocabulary AccountTypeVocab." ; - sh:path uco-observable:accountType ; - sh:severity sh:Info ; - ] ; - sh:value "Phone" ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:manufacturer ; - sh:resultSeverity sh:Violation ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:manufacturer ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:version ; - sh:resultSeverity sh:Violation ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:version ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; + sh:result [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; + sh:resultPath uco-observable:accountType ; + sh:resultSeverity sh:Info ; + sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; + sh:sourceShape [ + sh:datatype vocabulary:AccountTypeVocab ; + sh:message "Value is outside the default vocabulary AccountTypeVocab." ; + sh:path uco-observable:accountType ; + sh:severity sh:Info ; + ] ; + sh:value "Phone" ; + ] ; . diff --git a/examples/asgard/asgard_validation-unstable.ttl b/examples/asgard/asgard_validation-unstable.ttl index 37c35c15..cf20dece 100644 --- a/examples/asgard/asgard_validation-unstable.ttl +++ b/examples/asgard/asgard_validation-unstable.ttl @@ -8,51 +8,21 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; - sh:resultPath uco-observable:accountType ; - sh:resultSeverity sh:Info ; - sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; - sh:sourceShape [ - sh:datatype vocabulary:AccountTypeVocab ; - sh:message "Value is outside the default vocabulary AccountTypeVocab." ; - sh:path uco-observable:accountType ; - sh:severity sh:Info ; - ] ; - sh:value "Phone" ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:version ; - sh:severity sh:Warning ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; + sh:result [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; + sh:resultPath uco-observable:accountType ; + sh:resultSeverity sh:Info ; + sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; + sh:sourceShape [ + sh:datatype vocabulary:AccountTypeVocab ; + sh:message "Value is outside the default vocabulary AccountTypeVocab." ; + sh:path uco-observable:accountType ; + sh:severity sh:Info ; + ] ; + sh:value "Phone" ; + ] ; . diff --git a/examples/asgard/index.html b/examples/asgard/index.html index 5ab45179..e787b238 100644 --- a/examples/asgard/index.html +++ b/examples/asgard/index.html @@ -141,6 +141,12 @@
Examples of an InvestigativeAction & ProvenanceRecord Objects
}, { "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4" } ] }, @@ -152,6 +158,12 @@
Examples of an InvestigativeAction & ProvenanceRecord Objects
"uco-core:object": [ { "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4" } ] }, @@ -199,15 +211,6 @@
Examples of an InvestigativeAction & ProvenanceRecord Objects
"drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774", "drafting:ownerName": "Loki iPhone" }, - { - "@id": "kb:operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "iOS", - "uco-observable:manufacturer": { - "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" - }, - "uco-observable:version": "10.3" - }, { "@id": "kb:wifi-address-facet-27d5903b-0037-4a98-acad-4f5003461899", "@type": "uco-observable:WifiAddressFacet", @@ -220,6 +223,34 @@
Examples of an InvestigativeAction & ProvenanceRecord Objects
} ] }, + { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "iOS", + "uco-core:hasFacet": { + "@id": "kb:software-facet-fbedb8fd-0b1c-4470-a8dd-14612514bd56", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" + }, + "uco-observable:version": "10.3" + } + }, + { + "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4", + "@type": "uco-observable:ObservableRelationship", + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:isDirectional": true, + "uco-core:source": { + "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f" + }, + "uco-core:target": { + "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3" + } + }, { "@id": "kb:mobileaccount-74b4e46a-bee3-48f7-a5db-a6178d92aa90", "@type": "uco-observable:MobileAccount", diff --git a/examples/crossover_wmd/crossover_wmd.json b/examples/crossover_wmd/crossover_wmd.json index 00ba67be..25f0a348 100644 --- a/examples/crossover_wmd/crossover_wmd.json +++ b/examples/crossover_wmd/crossover_wmd.json @@ -80,16 +80,6 @@ ], "uco-observable:IMEI": "356420075722843" }, - { - "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" - }, - "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259", - "uco-observable:version": "6.0.1" - }, { "@id": "kb:wifi-address-facet-047a5278-1e8a-4e38-b2f6-1b77894624b8", "@type": "uco-observable:WifiAddressFacet", @@ -102,6 +92,41 @@ } ] }, + { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Android", + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259" + }, + { + "@id": "kb:software-facet-da02e9c9-b35b-42e7-bbc8-013b15e17803", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" + }, + "uco-observable:version": "6.0.1" + } + ] + }, + { + "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" + }, + "uco-core:target": { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d" + } + }, { "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec", "@type": "uco-identity:Organization", @@ -193,9 +218,17 @@ { "@id": "kb:provenancerecord-9326149a-31c5-4d20-ada3-b97743d3e563", "@type": "case-investigation:ProvenanceRecord", - "uco-core:object": { - "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" - } + "uco-core:object": [ + { + "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" + }, + { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d" + }, + { + "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d" + } + ] }, { "@id": "kb:file-f7cad990-6687-4849-89dc-55795675f3f5", diff --git a/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl b/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl index f684449a..20af041e 100644 --- a/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl +++ b/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl @@ -8,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; + sh:conforms "true"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -39,32 +39,6 @@ sh:severity sh:Info ; ] ; sh:value "Phone" ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:manufacturer ; - sh:resultSeverity sh:Violation ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:manufacturer ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:version ; - sh:resultSeverity sh:Violation ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:version ; - ] ; ] ; . diff --git a/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl b/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl index 2baf33ff..20af041e 100644 --- a/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl +++ b/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl @@ -8,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; + sh:conforms "true"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -39,34 +39,6 @@ sh:severity sh:Info ; ] ; sh:value "Phone" ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:version ; - sh:severity sh:Warning ; - ] ; ] ; . diff --git a/examples/crossover_wmd/index.html b/examples/crossover_wmd/index.html index 5f637b41..1b6e5367 100644 --- a/examples/crossover_wmd/index.html +++ b/examples/crossover_wmd/index.html @@ -338,9 +338,17 @@

CASE Representation of data extraction

{ "@id": "kb:provenancerecord-9326149a-31c5-4d20-ada3-b97743d3e563", "@type": "case-investigation:ProvenanceRecord", - "uco-core:object": { - "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" - } + "uco-core:object": [ + { + "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" + }, + { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d" + }, + { + "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d" + } + ] } ] {% endhighlight %} @@ -550,16 +558,6 @@

CASE Representation of Android Device Properties

], "uco-observable:IMEI": "356420075722843" }, - { - "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" - }, - "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259", - "uco-observable:version": "6.0.1" - }, { "@id": "kb:wifi-address-facet-047a5278-1e8a-4e38-b2f6-1b77894624b8", "@type": "uco-observable:WifiAddressFacet", @@ -572,6 +570,41 @@

CASE Representation of Android Device Properties

} ] }, + { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Android", + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259" + }, + { + "@id": "kb:software-facet-da02e9c9-b35b-42e7-bbc8-013b15e17803", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" + }, + "uco-observable:version": "6.0.1" + } + ] + }, + { + "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4" + }, + "uco-core:target": { + "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d" + } + }, { "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec", "@type": "uco-identity:Organization", diff --git a/examples/owl_trafficking/index.html b/examples/owl_trafficking/index.html index bfaa7d35..a0f25009 100644 --- a/examples/owl_trafficking/index.html +++ b/examples/owl_trafficking/index.html @@ -309,6 +309,12 @@

CASE Representation of Evidence Integrity Details

"uco-core:object": [ { "@id": "kb:lge-device-eee670c6-01d4-4e42-bb6b-ebeca149b168" + }, + { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137" + }, + { + "@id": "kb:relationship-b41ecf43-d68c-440e-a8ae-b5978ebcbf98" } ] }, @@ -508,16 +514,6 @@
CASE Representation of Android Device Properties
}, "uco-observable:storageCapacityInBytes": 31268536320 }, - { - "@id": "kb:operating-system-facet-478dc553-2d39-45ff-8974-d3d1b8df7c75", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-lge-e7ae1d96-e054-44b5-9943-8da6515e8332" - }, - "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259", - "uco-observable:version": "6.0.1" - }, { "@id": "kb:wifi-address-facet-57724dcb-18f7-4913-a659-64ca79336107", "@type": "uco-observable:WifiAddressFacet", @@ -530,6 +526,41 @@
CASE Representation of Android Device Properties
} ] }, + { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Android", + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-478dc553-2d39-45ff-8974-d3d1b8df7c75", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259" + }, + { + "@id": "kb:software-facet-a3cd613c-1c35-4f0e-8983-a4720121fa9e", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-lge-e7ae1d96-e054-44b5-9943-8da6515e8332" + }, + "uco-observable:version": "6.0.1" + } + ] + }, + { + "@id": "kb:relationship-b41ecf43-d68c-440e-a8ae-b5978ebcbf98", + "@type": "uco-observable:ObservableRelationship", + "uco-core:source": { + "@id": "kb:lge-device-eee670c6-01d4-4e42-bb6b-ebeca149b168" + }, + "uco-core:target": { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137" + }, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:isDirectional": true + }, { "@id": "kb:relationship-6d7a7a20-ca70-4f7f-994d-c2db39e08545", "@type": "uco-core:Relationship", diff --git a/examples/owl_trafficking/owl_trafficking.json b/examples/owl_trafficking/owl_trafficking.json index dbf23c68..be483065 100644 --- a/examples/owl_trafficking/owl_trafficking.json +++ b/examples/owl_trafficking/owl_trafficking.json @@ -129,6 +129,12 @@ "uco-core:object": [ { "@id": "kb:lge-device-eee670c6-01d4-4e42-bb6b-ebeca149b168" + }, + { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137" + }, + { + "@id": "kb:relationship-b41ecf43-d68c-440e-a8ae-b5978ebcbf98" } ] }, @@ -248,16 +254,6 @@ }, "uco-observable:storageCapacityInBytes": 31268536320 }, - { - "@id": "kb:operating-system-facet-478dc553-2d39-45ff-8974-d3d1b8df7c75", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-lge-e7ae1d96-e054-44b5-9943-8da6515e8332" - }, - "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259", - "uco-observable:version": "6.0.1" - }, { "@id": "kb:wifi-address-facet-57724dcb-18f7-4913-a659-64ca79336107", "@type": "uco-observable:WifiAddressFacet", @@ -270,6 +266,41 @@ } ] }, + { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Android", + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-478dc553-2d39-45ff-8974-d3d1b8df7c75", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259" + }, + { + "@id": "kb:software-facet-a3cd613c-1c35-4f0e-8983-a4720121fa9e", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-lge-e7ae1d96-e054-44b5-9943-8da6515e8332" + }, + "uco-observable:version": "6.0.1" + } + ] + }, + { + "@id": "kb:relationship-b41ecf43-d68c-440e-a8ae-b5978ebcbf98", + "@type": "uco-observable:ObservableRelationship", + "uco-core:source": { + "@id": "kb:lge-device-eee670c6-01d4-4e42-bb6b-ebeca149b168" + }, + "uco-core:target": { + "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137" + }, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:isDirectional": true + }, { "@id": "kb:relationship-6d7a7a20-ca70-4f7f-994d-c2db39e08545", "@type": "uco-core:Relationship", diff --git a/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl b/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl index 2ea64b45..13c0538e 100644 --- a/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl +++ b/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl @@ -8,49 +8,21 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; - sh:resultPath uco-observable:accountType ; - sh:resultSeverity sh:Info ; - sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; - sh:sourceShape [ - sh:datatype vocabulary:AccountTypeVocab ; - sh:message "Value is outside the default vocabulary AccountTypeVocab." ; - sh:path uco-observable:accountType ; - sh:severity sh:Info ; - ] ; - sh:value "phone" ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:manufacturer ; - sh:resultSeverity sh:Violation ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:manufacturer ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:version ; - sh:resultSeverity sh:Violation ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:version ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; + sh:result [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; + sh:resultPath uco-observable:accountType ; + sh:resultSeverity sh:Info ; + sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; + sh:sourceShape [ + sh:datatype vocabulary:AccountTypeVocab ; + sh:message "Value is outside the default vocabulary AccountTypeVocab." ; + sh:path uco-observable:accountType ; + sh:severity sh:Info ; + ] ; + sh:value "phone" ; + ] ; . diff --git a/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl b/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl index 678fd90b..13c0538e 100644 --- a/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl +++ b/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl @@ -8,51 +8,21 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; - sh:resultPath uco-observable:accountType ; - sh:resultSeverity sh:Info ; - sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; - sh:sourceShape [ - sh:datatype vocabulary:AccountTypeVocab ; - sh:message "Value is outside the default vocabulary AccountTypeVocab." ; - sh:path uco-observable:accountType ; - sh:severity sh:Info ; - ] ; - sh:value "phone" ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath uco-observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path uco-observable:version ; - sh:severity sh:Warning ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; + sh:result [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ; + sh:resultPath uco-observable:accountType ; + sh:resultSeverity sh:Info ; + sh:sourceConstraintComponent sh:DatatypeConstraintComponent ; + sh:sourceShape [ + sh:datatype vocabulary:AccountTypeVocab ; + sh:message "Value is outside the default vocabulary AccountTypeVocab." ; + sh:path uco-observable:accountType ; + sh:severity sh:Info ; + ] ; + sh:value "phone" ; + ] ; .