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" ; + ] ; .