shapes: replace sh:name and sh:description with RDFS

shapes/fnml.ttl

@@ -30,141 +30,141 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 <http://w3id.org/rml/shapes/RMLFunctionExecutionShape> a sh:NodeShape ;
-    sh:description """
+    rdfs:comment """
     Represents a Function Execution.
     """ ;
-    sh:name "rml:FunctionExecution" ;
-    sh:property [ sh:description """
+    rdfs:label "rml:FunctionExecution" ;
+    sh:property [ rdfs:comment """
         Exactly one rml:function or rml:functionMap is required.
         """ ;
             sh:maxCount 1 ;
             sh:message """
         Exactly one rml:function or rml:functionMap is required.
         """ ;
             sh:minCount 1 ;
-            sh:name "rml:function/rml:functionMap" ;
+            rdfs:label "rml:function/rml:functionMap" ;
             sh:path [ sh:alternativePath ( rml:function rml:functionMap ) ] ],
-        [ sh:description """
+        [ rdfs:comment """
         FnO function to execute.
         """ ;
             sh:message """
         rml:functionMap must be an IRI or Blank node.
         """ ;
-            sh:name "rml:functionMap" ;
+            rdfs:label "rml:functionMap" ;
             sh:node <http://w3id.org/rml/shapes/RMLFunctionMap> ;
             sh:nodeKind sh:BlankNodeOrIRI ;
             sh:path rml:functionMap ],
-        [ sh:description """
+        [ rdfs:comment """
         FnO function to execute.
         """ ;
             sh:message """
         rml:function must be an IRI.
         """ ;
-            sh:name "rml:function" ;
+            rdfs:label "rml:function" ;
             sh:nodeKind sh:IRI ;
             sh:path rml:function ],
-        [ sh:description """
+        [ rdfs:comment """
         Input parameters for the function.
         """ ;
             sh:message """
         rml:input must be an IRI or Blank node.
         """ ;
-            sh:name "rml:input" ;
+            rdfs:label "rml:input" ;
             sh:nodeKind sh:BlankNodeOrIRI ;
             sh:path rml:input ] ;
     sh:targetObjectsOf rml:functionExecution .
 
 <http://w3id.org/rml/shapes/RMLFunctionMapShape> a sh:NodeShape ;
     sh:and ( <http://w3id.org/rml/shapes/RMLTermMapShape> <http://w3id.org/rml/shapes/RMLLogicalTargetPropertiesShape> [ ] ) ;
-    sh:description """
+    rdfs:comment """
     Represents a Function Map.
     """ ;
-    sh:name "FunctionMap" ;
+    rdfs:label "FunctionMap" ;
     sh:targetObjectsOf rml:functionMap .
 
 <http://w3id.org/rml/shapes/RMLInputShape> a sh:NodeShape ;
-    sh:description """
+    rdfs:comment """
     Represents an Input for a function.
     """ ;
-    sh:name "rml:Input" ;
-    sh:property [ sh:description """
+    rdfs:label "rml:Input" ;
+    sh:property [ rdfs:comment """
         Exactly one rml:parameter or rml:parameterMap is required.
         """ ;
             sh:maxCount 1 ;
             sh:message """
         Exactly one rml:parameter or rml:parameterMap is required.
         """ ;
             sh:minCount 1 ;
-            sh:name "rml:parameter/rml:parameterMap" ;
+            rdfs:label "rml:parameter/rml:parameterMap" ;
             sh:path [ sh:alternativePath ( rml:parameter rml:parameterMap ) ] ],
-        [ sh:description """
+        [ rdfs:comment """
         Values of the parameters.
         """ ;
             sh:maxCount 1 ;
             sh:message """
         rml:inputValueMap must be an IRI or Blank node, provided once.
         """ ;
-            sh:name "rml:inputValueMap" ;
+            rdfs:label "rml:inputValueMap" ;
             sh:nodeKind sh:BlankNodeOrIRI ;
             sh:path rml:inputValueMap ],
         [ sh:datatype xsd:string ;
-            sh:description """
+            rdfs:comment """
         Parameters to supply to FnO function.
         """ ;
             sh:maxCount 1 ;
             sh:message """
         rml:inputValue must be a string Literal.
         """ ;
-            sh:name "rml:inputValue" ;
+            rdfs:label "rml:inputValue" ;
             sh:nodeKind sh:Literal ;
             sh:path rml:inputValue ],
-        [ sh:description """
+        [ rdfs:comment """
         Parameters to supply to FnO function.
         """ ;
             sh:maxCount 1 ;
             sh:message """
         rml:parameterMap must be an IRI or Blank node.
         """ ;
-            sh:name "rml:parameterMap" ;
+            rdfs:label "rml:parameterMap" ;
             sh:node <http://w3id.org/rml/shapes/RMLParameterMap> ;
             sh:nodeKind sh:BlankNodeOrIRI ;
             sh:path rml:parameterMap ],
-        [ sh:description """
+        [ rdfs:comment """
         Parameters to supply to FnO function.
         """ ;
             sh:maxCount 1 ;
             sh:message """
         rml:parameter must be an IRI.
         """ ;
-            sh:name "rml:parameter" ;
+            rdfs:label "rml:parameter" ;
             sh:nodeKind sh:IRI ;
             sh:path rml:parameter ],
-        [ sh:description """
+        [ rdfs:comment """
         Exactly one rml:inputValue or rml:inputValueMap is required.
         """ ;
             sh:maxCount 1 ;
             sh:message """
         Exactly one rml:inputValue or rml:inputValueMap is required.
         """ ;
             sh:minCount 1 ;
-            sh:name "rml:inputValue/rml:inputValueMap" ;
+            rdfs:label "rml:inputValue/rml:inputValueMap" ;
             sh:path [ sh:alternativePath ( rml:inputValue rml:inputValueMap ) ] ] ;
     sh:targetObjectsOf rml:input .
 
 <http://w3id.org/rml/shapes/RMLParameterMapShape> a sh:NodeShape ;
     sh:and ( <http://w3id.org/rml/shapes/RMLTermMapShape> <http://w3id.org/rml/shapes/RMLLogicalTargetPropertiesShape> [ ] ) ;
-    sh:description """
+    rdfs:comment """
     Represents a Parameter Map of a function.
     """ ;
-    sh:name "ParameterMap" ;
+    rdfs:label "ParameterMap" ;
     sh:targetObjectsOf rml:parameterMap .
 
 <http://w3id.org/rml/shapes/RMLReturnMapShape> a sh:NodeShape ;
     sh:and ( <http://w3id.org/rml/shapes/RMLTermMapShape> <http://w3id.org/rml/shapes/RMLLogicalTargetPropertiesShape> [ ] ) ;
-    sh:description """
+    rdfs:comment """
     Represents a Return Map.
     """ ;
-    sh:name "ReturnMap" ;
+    rdfs:label "ReturnMap" ;
     sh:targetObjectsOf rml:returnMap .
 
 <http://w3id.org/rml/shapes/RMLLogicalTargetPropertiesShape> a sh:NodeShape .

shapes/function_execution.ttl

@@ -1,17 +1,18 @@
 ###############################################################################
-# RML FunctionExecution shape                                                        #
-# Copyright Dylan Van Assche, IDLab - UGent - imec (2023)                     #
+# RML FunctionExecution shape                                                 #
+# Copyright Dylan Van Assche, IDLab - UGent - imec (2023 - 2024)              #
 ###############################################################################
 @prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix : <http://w3id.org/rml/shapes/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rml: <http://w3id.org/rml/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 
 
 :RMLFunctionExecutionShape
     a sh:NodeShape ;
-    sh:name "rml:FunctionExecution" ;
-    sh:description """
+    rdfs:label "rml:FunctionExecution" ;
+    rdfs:comment """
     Represents a Function Execution.
     """ ;
     sh:targetObjectsOf rml:functionExecution ;
@@ -20,8 +21,8 @@
     sh:property [
         sh:path [sh:alternativePath (rml:function 
                                      rml:functionMap)] ;
-        sh:name "rml:function/rml:functionMap" ;
-        sh:description """
+        rdfs:label "rml:function/rml:functionMap" ;
+        rdfs:comment """
         Exactly one rml:function or rml:functionMap is required.
         """ ;
         sh:message """
@@ -34,8 +35,8 @@
     # rml:functionMap non-shortcut
     sh:property [
         sh:path rml:functionMap ;
-        sh:name "rml:functionMap" ;
-        sh:description """
+        rdfs:label "rml:functionMap" ;
+        rdfs:comment """
         FnO function to execute.
         """ ;
         sh:message """
@@ -48,8 +49,8 @@
     # rml:function shortcut
     sh:property [
         sh:path rml:function ;
-        sh:name "rml:function" ;
-        sh:description """
+        rdfs:label "rml:function" ;
+        rdfs:comment """
         FnO function to execute.
         """ ;
         sh:message """
@@ -61,8 +62,8 @@
     # rml:input
     sh:property [
         sh:path rml:input ;
-        sh:name "rml:input" ;
-        sh:description """
+        rdfs:label "rml:input" ;
+        rdfs:comment """
         Input parameters for the function.
         """ ;
         sh:message """

shapes/function_map.ttl

@@ -1,17 +1,18 @@
 ###############################################################################
-# RML Function Map shape                                                     #
-# Copyright Dylan Van Assche, IDLab - UGent - imec (2023)                     #
+# RML Function Map shape                                                      #
+# Copyright Dylan Van Assche, IDLab - UGent - imec (2023 - 2024)              #
 ###############################################################################
 @prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix : <http://w3id.org/rml/shapes/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rml: <http://w3id.org/rml/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 
 
 :RMLFunctionMapShape
     a sh:NodeShape ;
-    sh:name "FunctionMap" ;
-    sh:description """
+    rdfs:label "FunctionMap" ;
+    rdfs:comment """
     Represents a Function Map.
     """ ;
     sh:targetObjectsOf rml:functionMap ;

shapes/input.ttl

@@ -1,17 +1,18 @@
 ###############################################################################
-# RML Input shape                                                            #
-# Copyright Dylan Van Assche, IDLab - UGent - imec (2023)                     #
+# RML Input shape                                                             #
+# Copyright Dylan Van Assche, IDLab - UGent - imec (2023 - 2024)              #
 ###############################################################################
 @prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix : <http://w3id.org/rml/shapes/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rml: <http://w3id.org/rml/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 
 
 :RMLInputShape
     a sh:NodeShape ;
-    sh:name "rml:Input" ;
-    sh:description """
+    rdfs:label "rml:Input" ;
+    rdfs:comment """
     Represents an Input for a function.
     """ ;
     sh:targetObjectsOf rml:input ;
@@ -20,8 +21,8 @@
     sh:property [
         sh:path [sh:alternativePath (rml:parameter 
                                      rml:parameterMap)] ;
-        sh:name "rml:parameter/rml:parameterMap" ;
-        sh:description """
+        rdfs:label "rml:parameter/rml:parameterMap" ;
+        rdfs:comment """
         Exactly one rml:parameter or rml:parameterMap is required.
         """ ;
         sh:message """
@@ -34,8 +35,8 @@
     # rml:parameterMap non-shortcut
     sh:property [
         sh:path rml:parameterMap ;
-        sh:name "rml:parameterMap" ;
-        sh:description """
+        rdfs:label "rml:parameterMap" ;
+        rdfs:comment """
         Parameters to supply to FnO function.
         """ ;
         sh:message """
@@ -49,8 +50,8 @@
     # rml:parameter shortcut
     sh:property [
         sh:path rml:parameter ;
-        sh:name "rml:parameter" ;
-        sh:description """
+        rdfs:label "rml:parameter" ;
+        rdfs:comment """
         Parameters to supply to FnO function.
         """ ;
         sh:message """
@@ -64,8 +65,8 @@
     sh:property [
         sh:path [sh:alternativePath (rml:inputValue 
                                      rml:inputValueMap)] ;
-        sh:name "rml:inputValue/rml:inputValueMap" ;
-        sh:description """
+        rdfs:label "rml:inputValue/rml:inputValueMap" ;
+        rdfs:comment """
         Exactly one rml:inputValue or rml:inputValueMap is required.
         """ ;
         sh:message """
@@ -78,8 +79,8 @@
     # rml:inputValueMap
     sh:property [
         sh:path rml:inputValueMap ;
-        sh:name "rml:inputValueMap" ;
-        sh:description """
+        rdfs:label "rml:inputValueMap" ;
+        rdfs:comment """
         Values of the parameters.
         """ ;
         sh:message """
@@ -92,8 +93,8 @@
     # rml:inputValue shortcut
     sh:property [
         sh:path rml:inputValue ;
-        sh:name "rml:inputValue" ;
-        sh:description """
+        rdfs:label "rml:inputValue" ;
+        rdfs:comment """
         Parameters to supply to FnO function.
         """ ;
         sh:message """

shapes/parameter_map.ttl

@@ -1,17 +1,18 @@
 ###############################################################################
-# RML Parameter Map shape                                                    #
-# Copyright Dylan Van Assche, IDLab - UGent - imec (2023)                     #
+# RML Parameter Map shape                                                     #
+# Copyright Dylan Van Assche, IDLab - UGent - imec (2023 - 2024)              #
 ###############################################################################
 @prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix : <http://w3id.org/rml/shapes/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rml: <http://w3id.org/rml/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 
 
 :RMLParameterMapShape
     a sh:NodeShape ;
-    sh:name "ParameterMap" ;
-    sh:description """
+    rdfs:label "ParameterMap" ;
+    rdfs:comment """
     Represents a Parameter Map of a function.
     """ ;
     sh:targetObjectsOf rml:parameterMap ;

shapes/return_map.ttl

@@ -1,17 +1,18 @@
 ###############################################################################
-# RML Return Map shape                                                       #
-# Copyright Dylan Van Assche, IDLab - UGent - imec (2023)                     #
+# RML Return Map shape                                                        #
+# Copyright Dylan Van Assche, IDLab - UGent - imec (2023 - 2024)              #
 ###############################################################################
 @prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix : <http://w3id.org/rml/shapes/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rml: <http://w3id.org/rml/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 
 
 :RMLReturnMapShape
     a sh:NodeShape ;
-    sh:name "ReturnMap" ;
-    sh:description """
+    rdfs:label "ReturnMap" ;
+    rdfs:comment """
     Represents a Return Map.
     """ ;
     sh:targetObjectsOf rml:returnMap ;