From 04e286e8c996368621da919aef3f947aa927608f Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:54:13 +0100 Subject: [PATCH 1/6] Create metadata.json --- io.catenax.asset_tracker_links/2.0.0/metadata.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 io.catenax.asset_tracker_links/2.0.0/metadata.json diff --git a/io.catenax.asset_tracker_links/2.0.0/metadata.json b/io.catenax.asset_tracker_links/2.0.0/metadata.json new file mode 100644 index 00000000..c22749ae --- /dev/null +++ b/io.catenax.asset_tracker_links/2.0.0/metadata.json @@ -0,0 +1 @@ +{ "status" : "release"} From 6497d225d5043c27c98ff01d9b54f4f0850a270d Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:56:12 +0100 Subject: [PATCH 2/6] AssetTrackerLinks new version according Issue #429. --- .../2.0.0/AssetTrackerLinks.ttl | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl diff --git a/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl b/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl new file mode 100644 index 00000000..e69071c2 --- /dev/null +++ b/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl @@ -0,0 +1,105 @@ +####################################################################### +# Copyright (c) 2023 BASF SE +# Copyright (c) 2023 Henkel AG & Co. KGaA +# Copyright (c) 2023 ZF Friedrichshafen AG +# Copyright (c) 2023 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This work is made available under the terms of the +# Creative Commons Attribution 4.0 International (CC-BY-4.0) license, +# which is available at +# https://creativecommons.org/licenses/by/4.0/legalcode. +# +# SPDX-License-Identifier: CC-BY-4.0 +####################################################################### + +@prefix samm: . +@prefix samm-c: . +@prefix samm-e: . +@prefix unit: . +@prefix rdf: . +@prefix rdfs: . +@prefix xsd: . +@prefix : . + +:AssetTrackerLinks a samm:Aspect ; + samm:preferredName "Asset Tracker Links"@en ; + samm:description "Represent the link between Asset and IoT Device (tracker) with timestamps of pairing and unpairing."@en ; + samm:properties ( :catenaXId :childItems ) ; + samm:operations ( ) ; + samm:events ( ) . + +:catenaXId a samm:Property ; + samm:preferredName "Catena-X Identifier"@en ; + samm:description "The Catena-X ID of the givenasset, valid for the Catena-X dataspace."@en ; + samm:characteristic :CatenaXIdTraitCharacteristic ; + samm:exampleValue "urn:uuid:ed85f17e-29dd-473c-9cb8-d7ad1dc44d2f" . + +:childItems a samm:Property ; + samm:preferredName "Child Items"@en ; + samm:description "Set of child items, of which the given parent object consist of."@en ; + samm:characteristic :SetOfChildItemsCharacteristic . + +:CatenaXIdTraitCharacteristic a samm-c:Trait ; + samm:description "Trait to ensure UUID v4 data format"@en ; + samm-c:baseCharacteristic :UUIDv4Characteristic ; + samm-c:constraint :UUIDv4RegularExpression . + +:SetOfChildItemsCharacteristic a samm-c:Set ; + samm:preferredName "Set of Child Items"@en ; + samm:description "Set of child items the parent item is linked to."@en ; + samm:dataType :ChildData . + +:UUIDv4Characteristic a samm:Characteristic ; + samm:preferredName "UUID v4"@en ; + samm:description "A version 4 UUID is a universally unique identifier that is generated using random 32 hexadecimal characters."@en ; + samm:see ; + samm:dataType xsd:string . + +:UUIDv4RegularExpression a samm-c:RegularExpressionConstraint ; + samm:preferredName "Catena-X Id Regular Expression"@en ; + samm:description "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI."@en ; + samm:see ; + samm:value "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" . + +:ChildData a samm:Entity ; + samm:preferredName "Child Data"@en ; + samm:description "Catena-X ID and meta data of the child item."@en ; + samm:properties ( :paired :pairedOn :unpairedOn [ samm:property :historicalData; samm:optional true ] :catenaXId ) . + +:paired a samm:Property ; + samm:preferredName "paired"@en ; + samm:description "Currently paired when set to true."@en ; + samm:characteristic :PairedCharacteristic ; + samm:exampleValue true . + +:pairedOn a samm:Property ; + samm:preferredName "Paired On"@en ; + samm:description "Timestamp of pairing of an IoT Device to an Asset."@en ; + samm:characteristic samm-c:Timestamp ; + samm:exampleValue "2023-02-03T14:48:54.709Z"^^xsd:dateTime . + +:unpairedOn a samm:Property ; + samm:preferredName "Unpaired On"@en ; + samm:description "Timestamp of the unpairing of an IoT Device from an Asset."@en ; + samm:characteristic samm-c:Timestamp ; + samm:exampleValue "2023-02-04T14:48:54.709Z"^^xsd:dateTime . + +:historicalData a samm:Property ; + samm:preferredName "Historical Data"@en ; + samm:description "Describes the location where the historical sensor data can be found. "@en ; + samm:characteristic :ResourcePath ; + samm:exampleValue "https://mycompany.s3.amazonaws.com/historicalsensordata"^^xsd:anyURI . + +:PairedCharacteristic a samm:Characteristic ; + samm:preferredName "Paired Characteristic"@en ; + samm:description "Characteristic describing the property paired."@en ; + samm:dataType xsd:boolean . + +:ResourcePath a samm:Characteristic ; + samm:preferredName "Resource Path"@en ; + samm:description "The path of a resource."@en ; + samm:dataType xsd:anyURI . + From 66f364a6bad181863c7accfb249a4ac4e173d7c0 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:57:53 +0100 Subject: [PATCH 3/6] Update RELEASE_NOTES.md --- io.catenax.asset_tracker_links/RELEASE_NOTES.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/io.catenax.asset_tracker_links/RELEASE_NOTES.md b/io.catenax.asset_tracker_links/RELEASE_NOTES.md index 35833d3a..00565eb2 100644 --- a/io.catenax.asset_tracker_links/RELEASE_NOTES.md +++ b/io.catenax.asset_tracker_links/RELEASE_NOTES.md @@ -3,6 +3,17 @@ All notable changes to this model will be documented in this file. ## [Unreleased] + +## [2.0.0] - 2023-11-13 +### Added + +### Changed +* rename childCatenaXId to catenaXId +* rename childParts to childItems +* convert from BAMM to SAMM + +### Removed + ## [1.0.0] - 2023-02-22 ### Added - initial model From 52eddd3bc3f0084f35bcd3096024c2e97cedd78a Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:00:02 +0100 Subject: [PATCH 4/6] Update AssetTrackerLinks.ttl Adjusted to use the shared aspect for UUID. --- .../2.0.0/AssetTrackerLinks.ttl | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl b/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl index e69071c2..840e9d4f 100644 --- a/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl +++ b/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl @@ -23,6 +23,7 @@ @prefix rdfs: . @prefix xsd: . @prefix : . +@prefix ext-uuid: . :AssetTrackerLinks a samm:Aspect ; samm:preferredName "Asset Tracker Links"@en ; @@ -34,7 +35,7 @@ :catenaXId a samm:Property ; samm:preferredName "Catena-X Identifier"@en ; samm:description "The Catena-X ID of the givenasset, valid for the Catena-X dataspace."@en ; - samm:characteristic :CatenaXIdTraitCharacteristic ; + samm:characteristic ext-uuid:UuidV4Trait ; samm:exampleValue "urn:uuid:ed85f17e-29dd-473c-9cb8-d7ad1dc44d2f" . :childItems a samm:Property ; @@ -42,28 +43,11 @@ samm:description "Set of child items, of which the given parent object consist of."@en ; samm:characteristic :SetOfChildItemsCharacteristic . -:CatenaXIdTraitCharacteristic a samm-c:Trait ; - samm:description "Trait to ensure UUID v4 data format"@en ; - samm-c:baseCharacteristic :UUIDv4Characteristic ; - samm-c:constraint :UUIDv4RegularExpression . - :SetOfChildItemsCharacteristic a samm-c:Set ; samm:preferredName "Set of Child Items"@en ; samm:description "Set of child items the parent item is linked to."@en ; samm:dataType :ChildData . -:UUIDv4Characteristic a samm:Characteristic ; - samm:preferredName "UUID v4"@en ; - samm:description "A version 4 UUID is a universally unique identifier that is generated using random 32 hexadecimal characters."@en ; - samm:see ; - samm:dataType xsd:string . - -:UUIDv4RegularExpression a samm-c:RegularExpressionConstraint ; - samm:preferredName "Catena-X Id Regular Expression"@en ; - samm:description "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI."@en ; - samm:see ; - samm:value "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" . - :ChildData a samm:Entity ; samm:preferredName "Child Data"@en ; samm:description "Catena-X ID and meta data of the child item."@en ; @@ -73,7 +57,7 @@ samm:preferredName "paired"@en ; samm:description "Currently paired when set to true."@en ; samm:characteristic :PairedCharacteristic ; - samm:exampleValue true . + samm:exampleValue false . :pairedOn a samm:Property ; samm:preferredName "Paired On"@en ; From d8209968fe268ba0c0f2b4c048d19d26a6a5c841 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:30:03 +0100 Subject: [PATCH 5/6] Update RELEASE_NOTES.md --- io.catenax.asset_tracker_links/RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.catenax.asset_tracker_links/RELEASE_NOTES.md b/io.catenax.asset_tracker_links/RELEASE_NOTES.md index 00565eb2..c642535f 100644 --- a/io.catenax.asset_tracker_links/RELEASE_NOTES.md +++ b/io.catenax.asset_tracker_links/RELEASE_NOTES.md @@ -4,7 +4,7 @@ All notable changes to this model will be documented in this file. ## [Unreleased] -## [2.0.0] - 2023-11-13 +## [2.0.0] - 2023-11-20 ### Added ### Changed From 44c7a4ace58ff1a6b94fff76870698f82fcf485e Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:36:53 +0100 Subject: [PATCH 6/6] Update AssetTrackerLinks.ttl fixed typo --- io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl b/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl index 840e9d4f..5d0cf5fb 100644 --- a/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl +++ b/io.catenax.asset_tracker_links/2.0.0/AssetTrackerLinks.ttl @@ -34,7 +34,7 @@ :catenaXId a samm:Property ; samm:preferredName "Catena-X Identifier"@en ; - samm:description "The Catena-X ID of the givenasset, valid for the Catena-X dataspace."@en ; + samm:description "The Catena-X ID of the given asset, valid for the Catena-X dataspace."@en ; samm:characteristic ext-uuid:UuidV4Trait ; samm:exampleValue "urn:uuid:ed85f17e-29dd-473c-9cb8-d7ad1dc44d2f" .