From b222c6d34b5627033bf25a2c57693e2fd2b29776 Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <dylan.vanassche@ugent.be>
Date: Thu, 1 Aug 2024 09:29:48 +0200
Subject: [PATCH] shapes: replace sh:name and sh:description with RDFS

Fixes https://github.com/kg-construct/rml-core/issues/139
---
 shapes/assertedtriples_map.ttl    |  5 +++--
 shapes/nonassertedtriples_map.ttl |  5 +++--
 shapes/star.ttl                   | 12 ++++++------
 shapes/star_map.ttl               | 11 ++++++-----
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/shapes/assertedtriples_map.ttl b/shapes/assertedtriples_map.ttl
index f50109a..df22c6a 100644
--- a/shapes/assertedtriples_map.ttl
+++ b/shapes/assertedtriples_map.ttl
@@ -1,8 +1,9 @@
 ###############################################################################
 # RML Asserted Triples Map shape                                              #
-# Copyright Dylan Van Assche, IDLab - UGent - imec (2023)                     #
+# Copyright Dylan Van Assche, IDLab - UGent - imec (2023 - 2024)              #
 ###############################################################################
 @prefix : <http://w3id.org/rml/shapes/> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rml: <http://w3id.org/rml/> .
@@ -13,7 +14,7 @@
     a sh:NodeShape ;
     sh:targetClass rml:AssertedTriplesMap ;
     sh:message "AssertedTriplesMap" ;
-    sh:description """
+    rdfs:comment """
     Represents a Asserted Triples Map.
     """ ;
     sh:message """
diff --git a/shapes/nonassertedtriples_map.ttl b/shapes/nonassertedtriples_map.ttl
index 79216f8..ff89293 100644
--- a/shapes/nonassertedtriples_map.ttl
+++ b/shapes/nonassertedtriples_map.ttl
@@ -1,8 +1,9 @@
 ###############################################################################
 # RML Non Asserted Triples Map shape                                          #
-# Copyright Dylan Van Assche, IDLab - UGent - imec (2023)                     #
+# Copyright Dylan Van Assche, IDLab - UGent - imec (2023 - 2024)              #
 ###############################################################################
 @prefix : <http://w3id.org/rml/shapes/> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rml: <http://w3id.org/rml/> .
@@ -13,7 +14,7 @@
     a sh:NodeShape ;
     sh:targetClass rml:NonAssertedTriplesMap ;
     sh:message "NonAssertedTriplesMap" ;
-    sh:description """
+    rdfs:comment """
     Represents a Non Asserted Triples Map.
     """ ;
     sh:message """
diff --git a/shapes/star.ttl b/shapes/star.ttl
index 4fb8c27..3a2131c 100644
--- a/shapes/star.ttl
+++ b/shapes/star.ttl
@@ -54,7 +54,7 @@
     sh:targetObjectsOf rml:quotedTriplesMap .
 
 <http://w3id.org/rml/shapes/RMLStarMapShape> a sh:NodeShape ;
-    sh:and ( <http://w3id.org/rml/shapes/RMLJoinConditionPropertiesShape> [ sh:description """
+    sh:and ( <http://w3id.org/rml/shapes/RMLJoinConditionPropertiesShape> [ rdfs:comment """
             An Quoted Triples Map element to generate a RDF-star triple as 
             subject or object or another triple from a logical source record.
             """ ;
@@ -63,17 +63,17 @@
             Exactly one rml:quotedTriplesMap is required.
             """ ;
                 sh:minCount 1 ;
-                sh:name "quotedTriplesMap" ;
+                rdfs:label "quotedTriplesMap" ;
                 sh:nodeKind sh:BlankNodeOrIRI ;
                 sh:path rml:quotedTriplesMap ] [ sh:message """
             An Quoted Triples Map may never be used for generating a predicate.
             """ ;
-                sh:name "PredicateMap" ;
+                rdfs:label "PredicateMap" ;
                 sh:targetObjectsOf rml:predicateObjectMap ;
                 sh:xone ( [ sh:minCount 1 ;
                             sh:path rml:predicate ] [ sh:minCount 1 ;
                             sh:path rml:predicateMap ] ) ] ) ;
-    sh:description """
+    rdfs:comment """
     Represents a Star Map.
     """ ;
     sh:message """
@@ -89,7 +89,7 @@
             """ ;
                 sh:path rdf:type ;
                 sh:value rml:AssertedTriplesMap ] ) ;
-    sh:description """
+    rdfs:comment """
     Represents a Asserted Triples Map.
     """ ;
     sh:message """
@@ -108,7 +108,7 @@
             """ ;
                 sh:path rdf:type ;
                 sh:value rml:NonAssertedTriplesMap ] ) ;
-    sh:description """
+    rdfs:comment """
     Represents a Non Asserted Triples Map.
     """ ;
     sh:message """
diff --git a/shapes/star_map.ttl b/shapes/star_map.ttl
index 50d6722..64e761c 100644
--- a/shapes/star_map.ttl
+++ b/shapes/star_map.ttl
@@ -1,8 +1,9 @@
 ###############################################################################
 # RML Star Map shape                                                          #
-# Copyright Dylan Van Assche, IDLab - UGent - imec (2023)                     #
+# Copyright Dylan Van Assche, IDLab - UGent - imec (2023 - 2024)              #
 ###############################################################################
 @prefix : <http://w3id.org/rml/shapes/> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rml: <http://w3id.org/rml/> .
@@ -13,7 +14,7 @@
     a sh:NodeShape ;
     sh:targetClass rml:StarMap ;
     sh:message "StarMap" ;
-    sh:description """
+    rdfs:comment """
     Represents a Star Map.
     """ ;
     sh:message """
@@ -27,8 +28,8 @@
         # Star Map specific shapes
         [
             sh:path rml:quotedTriplesMap ;
-            sh:name "quotedTriplesMap" ;
-            sh:description """
+            rdfs:label "quotedTriplesMap" ;
+            rdfs:comment """
             An Quoted Triples Map element to generate a RDF-star triple as 
             subject or object or another triple from a logical source record.
             """ ;
@@ -41,7 +42,7 @@
         ]
         [
             sh:targetObjectsOf rml:predicateObjectMap ;
-            sh:name "PredicateMap" ;
+            rdfs:label "PredicateMap" ;
             sh:message """
             An Quoted Triples Map may never be used for generating a predicate.
             """ ;