From eee7a54d03a3a6602eca133d24cd33640d934187 Mon Sep 17 00:00:00 2001 From: Philipp Hochmann Date: Wed, 29 Jun 2022 13:55:04 +0200 Subject: [PATCH 1/8] Add LogEntry + Shape --- .gitignore | 1 + taxonomies/Message.ttl | 35 +++++++++++++++++++++++++++++ testing/taxonomies/MessageShape.ttl | 25 +++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/.gitignore b/.gitignore index 0c3933a8..bca1a3af 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ artifacts *.project references/.DS_Store .DS_Store +.vscode/ \ No newline at end of file diff --git a/taxonomies/Message.ttl b/taxonomies/Message.ttl index 8b320d9d..4433318a 100644 --- a/taxonomies/Message.ttl +++ b/taxonomies/Message.ttl @@ -380,11 +380,46 @@ ids:requestedParticipant rdf:type owl:ObjectProperty ; # Log messaging # ------------- +ids:LogEntry a owl:Class; + rdfs:label "Log Entry"@en ; + rdfs:comment "Contains the metadata of a LogMessage"@en . + ids:LogMessage a owl:Class; rdfs:subClassOf ids:NotificationMessage ; rdfs:label "Log Message"@en ; rdfs:comment "Log Message which can be used to transfer logs e.g., to the clearing house."@en. +ids:logMessage a owl:ObjectProperty ; + rdfs:domain ids:LogEntry ; + rdfs:range ids:LogMessage ; + rdfs:comment "Links a LogEntry (Metadata) to a LogMessage (payload)"@en . + +ids:transactionID a owl:DatatypeProperty ; + rdfs:domain ids:LogEntry ; + rdfs:range xsd:unsignedInt ; + rdfs:comment "Links a LogEntry (Metadata) to a transactionID"@en . + +ids:processID a owl:DatatypeProperty ; + rdfs:domain ids:LogEntry ; + rdfs:range xsd:string ; + rdfs:comment "Links a LogEntry (Metadata) to a processID"@en . + +ids:documentID a owl:DatatypeProperty ; + rdfs:domain ids:LogEntry ; + rdfs:range xsd:string ; # UUID? + rdfs:comment "Links a LogEntry (Metadata) to a documentID"@en . + +# Timestamp given by dct:created + +ids:hasHash a owl:DatatypeProperty ; + rdfs:domain ids:LogEntry ; + rdfs:range xsd:string ; + rdfs:comment "Links a LogEntry (Metadata) to a hash"@en . + +ids:clientID a owl:DatatypeProperty ; + rdfs:domain ids:LogEntry ; + rdfs:range xsd:string ; + rdfs:comment "Links a LogEntry (Metadata) to a clientID"@en . # App-related Messages # --------------------- diff --git a/testing/taxonomies/MessageShape.ttl b/testing/taxonomies/MessageShape.ttl index d47c27d6..0ef1af4d 100644 --- a/testing/taxonomies/MessageShape.ttl +++ b/testing/taxonomies/MessageShape.ttl @@ -415,3 +415,28 @@ shapes:AppUploadMessageShape sh:severity sh:Violation ; sh:message " (AppUploadMessageShape): An ids:AppUploadMessage must have exactly one IRI reference to an ids:Artifact linked through the ids:appArtifactResource property"@en ; ] . + +# Log messaging +# ------------- + +shapes:LogEntryShape + a sh:NodeShape ; + sh:targetClass ids:LogEntry ; + + sh:property [ + a sh:PropertyShape ; + sh:path ids:logMessage ; + sh:class ids:LogMessage ; + sh:minCount 1 ; + sh:severity sh:Violation ; + sh:message " (LogEntryShape): An ids:LogEntry must not point to less than one ids:LogMessage though its ids:logMessage property"@en ; + ] ; + + sh:property [ + a sh:PropertyShape ; + sh:path dct:created ; + sh:datatype xsd:dateTimeStamp ; + sh:severity sh:Violation ; + sh:maxCount 1 ; + sh:message " (LogEntryShape): An ids:LogEntry must not point to more than one resource of datatype xsd:dateTimeStamp though the dct:created property"@en ; + ] . \ No newline at end of file From bc8c5c6759ca637e04dca1493d92fe9197d64e38 Mon Sep 17 00:00:00 2001 From: Philipp Hochmann Date: Mon, 4 Jul 2022 12:58:48 +0200 Subject: [PATCH 2/8] Add updated requests (with placeholder) --- taxonomies/Message.ttl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/taxonomies/Message.ttl b/taxonomies/Message.ttl index 4433318a..5c0cdaa5 100644 --- a/taxonomies/Message.ttl +++ b/taxonomies/Message.ttl @@ -389,7 +389,7 @@ ids:LogMessage a owl:Class; rdfs:label "Log Message"@en ; rdfs:comment "Log Message which can be used to transfer logs e.g., to the clearing house."@en. -ids:logMessage a owl:ObjectProperty ; +ids:payload a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range ids:LogMessage ; rdfs:comment "Links a LogEntry (Metadata) to a LogMessage (payload)"@en . @@ -421,6 +421,21 @@ ids:clientID a owl:DatatypeProperty ; rdfs:range xsd:string ; rdfs:comment "Links a LogEntry (Metadata) to a clientID"@en . +ids:serverID a owl:DatatypeProperty ; + rdfs:domain ids:LogEntry ; + rdfs:range xsd:string ; + rdfs:comment "Links a LogEntry (Metadata) to a serverID"@en . + +ids:signature a owl:DatatypeProperty ; + rdfs:domain ids:LogEntry ; + rdfs:range xsd:string ; + rdfs:comment "Links a LogEntry (Metadata) to a signature"@en . + +ids:payload a owl:?Property ; + rdfs:domain ids:LogEntry ; + rdfs:range ? ; + rdfs:comment "Links a LogEntry (Metadata) to a payload"@en . + # App-related Messages # --------------------- From b51eef2d65ea5a5cf8f5764e36363bdc80feff1b Mon Sep 17 00:00:00 2001 From: Philipp Hochmann Date: Tue, 12 Jul 2022 12:18:33 +0200 Subject: [PATCH 3/8] Add payload datatype property to LogEntry --- taxonomies/Message.ttl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taxonomies/Message.ttl b/taxonomies/Message.ttl index 5c0cdaa5..5682d207 100644 --- a/taxonomies/Message.ttl +++ b/taxonomies/Message.ttl @@ -431,9 +431,9 @@ ids:signature a owl:DatatypeProperty ; rdfs:range xsd:string ; rdfs:comment "Links a LogEntry (Metadata) to a signature"@en . -ids:payload a owl:?Property ; +ids:payload a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; - rdfs:range ? ; + rdfs:range xsd:string ; rdfs:comment "Links a LogEntry (Metadata) to a payload"@en . # App-related Messages From 624cb958f4edb1277e7818a9d2dc01a5552f128c Mon Sep 17 00:00:00 2001 From: Philipp Hochmann Date: Wed, 13 Jul 2022 15:20:10 +0200 Subject: [PATCH 4/8] Delete old Payload from LogEntry to LogMessage --- taxonomies/Message.ttl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/taxonomies/Message.ttl b/taxonomies/Message.ttl index 5682d207..2272575f 100644 --- a/taxonomies/Message.ttl +++ b/taxonomies/Message.ttl @@ -389,11 +389,6 @@ ids:LogMessage a owl:Class; rdfs:label "Log Message"@en ; rdfs:comment "Log Message which can be used to transfer logs e.g., to the clearing house."@en. -ids:payload a owl:DatatypeProperty ; - rdfs:domain ids:LogEntry ; - rdfs:range ids:LogMessage ; - rdfs:comment "Links a LogEntry (Metadata) to a LogMessage (payload)"@en . - ids:transactionID a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:unsignedInt ; From 0135cf14aca51ed378339e3783096e195322be08 Mon Sep 17 00:00:00 2001 From: Philipp Hochmann Date: Fri, 22 Jul 2022 16:29:42 +0200 Subject: [PATCH 5/8] Remove LogEntry->LogMessage property from SHACL --- taxonomies/Message.ttl | 8 ++++---- testing/taxonomies/MessageShape.ttl | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/taxonomies/Message.ttl b/taxonomies/Message.ttl index 2272575f..e0072ff5 100644 --- a/taxonomies/Message.ttl +++ b/taxonomies/Message.ttl @@ -380,15 +380,15 @@ ids:requestedParticipant rdf:type owl:ObjectProperty ; # Log messaging # ------------- -ids:LogEntry a owl:Class; - rdfs:label "Log Entry"@en ; - rdfs:comment "Contains the metadata of a LogMessage"@en . - ids:LogMessage a owl:Class; rdfs:subClassOf ids:NotificationMessage ; rdfs:label "Log Message"@en ; rdfs:comment "Log Message which can be used to transfer logs e.g., to the clearing house."@en. +ids:LogEntry a owl:Class; + rdfs:label "Log Entry"@en ; + rdfs:comment "Contains the metadata of a LogMessage"@en . + ids:transactionID a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:unsignedInt ; diff --git a/testing/taxonomies/MessageShape.ttl b/testing/taxonomies/MessageShape.ttl index 0ef1af4d..537198e1 100644 --- a/testing/taxonomies/MessageShape.ttl +++ b/testing/taxonomies/MessageShape.ttl @@ -423,15 +423,6 @@ shapes:LogEntryShape a sh:NodeShape ; sh:targetClass ids:LogEntry ; - sh:property [ - a sh:PropertyShape ; - sh:path ids:logMessage ; - sh:class ids:LogMessage ; - sh:minCount 1 ; - sh:severity sh:Violation ; - sh:message " (LogEntryShape): An ids:LogEntry must not point to less than one ids:LogMessage though its ids:logMessage property"@en ; - ] ; - sh:property [ a sh:PropertyShape ; sh:path dct:created ; From fb3dfa4a0eb3a0f20f8f4073b7a322193ea4e409 Mon Sep 17 00:00:00 2001 From: Philipp Hochmann Date: Mon, 1 Aug 2022 12:12:03 +0200 Subject: [PATCH 6/8] Update taxonomies/Message.ttl Co-authored-by: Johannes Theissen-Lipp <15930331+JohannesLipp@users.noreply.github.com> --- taxonomies/Message.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taxonomies/Message.ttl b/taxonomies/Message.ttl index e0072ff5..5fe7b0e9 100644 --- a/taxonomies/Message.ttl +++ b/taxonomies/Message.ttl @@ -406,7 +406,7 @@ ids:documentID a owl:DatatypeProperty ; # Timestamp given by dct:created -ids:hasHash a owl:DatatypeProperty ; +ids:hash a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:string ; rdfs:comment "Links a LogEntry (Metadata) to a hash"@en . From 4ae94f3e8c3d295b2e7ec41010a326107f431ba9 Mon Sep 17 00:00:00 2001 From: Philipp Hochmann Date: Mon, 1 Aug 2022 12:17:39 +0200 Subject: [PATCH 7/8] Add rdfs:label to Log Entry properties --- taxonomies/Message.ttl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/taxonomies/Message.ttl b/taxonomies/Message.ttl index 5fe7b0e9..1b1f77ff 100644 --- a/taxonomies/Message.ttl +++ b/taxonomies/Message.ttl @@ -386,22 +386,26 @@ ids:LogMessage a owl:Class; rdfs:comment "Log Message which can be used to transfer logs e.g., to the clearing house."@en. ids:LogEntry a owl:Class; + rdfs:label "Log Entry"@en ; rdfs:label "Log Entry"@en ; rdfs:comment "Contains the metadata of a LogMessage"@en . ids:transactionID a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:unsignedInt ; + rdfs:label "Transaction ID"@en ; rdfs:comment "Links a LogEntry (Metadata) to a transactionID"@en . ids:processID a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:string ; + rdfs:label "Process ID"@en ; rdfs:comment "Links a LogEntry (Metadata) to a processID"@en . ids:documentID a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:string ; # UUID? + rdfs:label "Document ID"@en ; rdfs:comment "Links a LogEntry (Metadata) to a documentID"@en . # Timestamp given by dct:created @@ -409,26 +413,31 @@ ids:documentID a owl:DatatypeProperty ; ids:hash a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:string ; + rdfs:label "Hash"@en ; rdfs:comment "Links a LogEntry (Metadata) to a hash"@en . ids:clientID a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:string ; + rdfs:label "Client ID"@en ; rdfs:comment "Links a LogEntry (Metadata) to a clientID"@en . ids:serverID a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:string ; + rdfs:label "Server ID"@en ; rdfs:comment "Links a LogEntry (Metadata) to a serverID"@en . ids:signature a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:string ; + rdfs:label "Signature"@en ; rdfs:comment "Links a LogEntry (Metadata) to a signature"@en . ids:payload a owl:DatatypeProperty ; rdfs:domain ids:LogEntry ; rdfs:range xsd:string ; + rdfs:label "Payload"@en ; rdfs:comment "Links a LogEntry (Metadata) to a payload"@en . # App-related Messages From 0d45ddb718f65e9923e7fdd66bd94fef52d9f87a Mon Sep 17 00:00:00 2001 From: Philipp Hochmann Date: Mon, 1 Aug 2022 15:24:18 +0200 Subject: [PATCH 8/8] Remove duplicated rdfs:label of LogEntry --- taxonomies/Message.ttl | 1 - 1 file changed, 1 deletion(-) diff --git a/taxonomies/Message.ttl b/taxonomies/Message.ttl index 1b1f77ff..6e75e1e1 100644 --- a/taxonomies/Message.ttl +++ b/taxonomies/Message.ttl @@ -386,7 +386,6 @@ ids:LogMessage a owl:Class; rdfs:comment "Log Message which can be used to transfer logs e.g., to the clearing house."@en. ids:LogEntry a owl:Class; - rdfs:label "Log Entry"@en ; rdfs:label "Log Entry"@en ; rdfs:comment "Contains the metadata of a LogMessage"@en .