International-Data-Spaces-Association · ssteinbuss · Jun 19, 2024 · Dec 12, 2023 · Jan 24, 2024 · Jan 26, 2024
diff --git a/catalog/message/example/catalog.json b/catalog/message/example/catalog.json
@@ -38,36 +38,39 @@
       ],
       "odrl:hasPolicy": [
         {
+          "@id": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
           "@type": "odrl:Offer",
-          "dspace:providerId": "http://example.com/Provider",
+          "odrl:assigner": "http://example.com/Provider",
           "odrl:permission": [
             {
               "odrl:action": "odrl:use",
               "odrl:constraint": [
                 {
                   "odrl:leftOperand": "odrl:spatial",
-                  "odrl:operator": "odrl:EQ",
-                  "odrl:rightOperand": "odrl:EU"
+                  "odrl:operator": "odrl:eq",
+                  "odrl:rightOperand": "http://example.org/EU"
                 }
               ],
-              "odrl:duty": []
+              "odrl:duty": {
+                "odrl:action": "cc:Attribution"
+              }
             }
-          ],
-          "odrl:prohibition": [],
-          "odrl:obligation": []
+          ]
         }
       ],
-      "dcat:distribution": {
-        "@type": "dcat:Distribution",
-        "dct:format": "dspace:s3+push",
-        "dcat:accessService": [
-          {
-            "@id": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77",
-            "@type": "dcat:DataService",
-            "dcat:endpointURL": "https://provider-a.com/connector"
-          }
-        ]
-      }
+      "dcat:distribution": [
+        {
+          "@type": "dcat:Distribution",
+          "dct:format": "dspace:s3+push",
+          "dcat:accessService": [
+            {
+              "@id": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77",
+              "@type": "dcat:DataService",
+              "dcat:endpointURL": "https://provider-a.com/connector"
+            }
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/catalog/message/example/dataset-request-message.json b/catalog/message/example/dataset-request-message.json
@@ -1,5 +1,5 @@
 {
   "@context":  "https://w3id.org/dspace/2024/1/context.json",
   "@type": "dspace:DatasetRequestMessage",
-  "dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88"
+  "dspace:dataset": "urn:uuid:3afeadd8-ed2d-569e-d634-8394a8836d57"
 }
diff --git a/catalog/message/example/dataset.json b/catalog/message/example/dataset.json
@@ -12,9 +12,10 @@
   "dcat:keyword": [
     "traffic"
   ],
-  "odrl:hasPolicy": {
+  "odrl:hasPolicy": [ {
     "@type": "odrl:Offer",
     "@id": "urn:uuid:2828282:3dd1add8-4d2d-569e-d634-8394a8836a88",
+    "odrl:assigner": "urn:tsdshhs636378",
     "odrl:permission": [
       {
         "odrl:action": "odrl:use",
@@ -27,7 +28,7 @@
         ]
       }
     ]
-  },
+  } ],
   "dcat:distribution": [
     {
       "@type": "dcat:Distribution",
@@ -42,4 +43,4 @@
       ]
     }
   ]
-}
+}
diff --git a/catalog/message/schema/catalog-schema.json b/catalog/message/schema/catalog-schema.json
@@ -13,7 +13,7 @@
             "type": "object",
             "allOf": [
                 {
-                    "$ref": "https://w3id.org/dspace/2024/1/catalog/dataset-schema.json#/definitions/Dataset"
+                    "$ref": "https://w3id.org/dspace/2024/1/catalog/dataset-schema.json#/definitions/AbstractDataset"
                 },
                 {
                     "properties": {
@@ -49,9 +49,11 @@
                 }
             ],
             "required": [ "@context", "@type" ],
-            "not": {
-                "required": [ "odrl:hasPolicy" ]
-            }
+            "anyOf" : [
+                {
+                    "not" : { "required" : [ "odrl:hasPolicy" ] }
+                }
+            ]
         }
     }
 }
diff --git a/catalog/message/schema/dataset-schema.json b/catalog/message/schema/dataset-schema.json
@@ -9,7 +9,7 @@
     ],
     "$id": "https://w3id.org/dspace/2024/1/catalog/dataset-schema.json",
     "definitions": {
-        "Dataset": {
+        "AbstractDataset": {
             "type": "object",
             "allOf": [
                 {
@@ -33,6 +33,14 @@
                         }
                     }
                 }
+            ]
+        },
+        "Dataset": {
+            "type": "object",
+            "allOf": [
+                {
+                    "$ref": "#/definitions/AbstractDataset"
+                }
             ],
             "required": [
                 "odrl:hasPolicy"
@@ -164,4 +172,4 @@
             "required": [ "@value", "@language" ]
         }
     }
-}
+}
diff --git a/catalog/message/shape/dataset-request-message-shape.ttl b/catalog/message/shape/dataset-request-message-shape.ttl
@@ -32,10 +32,9 @@ dspace_shapes:DatasetRequestMessageShape
 	sh:property [
 		a sh:PropertyShape ;
 		sh:path dspace:dataset ;
-		sh:class dcat:Dataset ;
 		sh:minCount 1 ;
 		sh:maxCount 1 ;
 		sh:severity sh:Violation ;
-		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/catalog-request-message-shape.ttl> (DatasetRequestMessage): An dspace:dataset property must point to one dcat:Dataset."@en ;
+		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-request-message-shape.ttl> (DatasetRequestMessage): There must be exactly one dspace:dataset property."@en ;
 	] ;
 .
diff --git a/catalog/message/shape/dataset-shape.ttl b/catalog/message/shape/dataset-shape.ttl
@@ -60,19 +60,19 @@ dspace_shapes:DatasetShape
     sh:property [
         a sh:PropertyShape ;
         sh:path dct:title ;
-        sh:datatype xsd:string ;
+        sh:datatype rdf:langString ;
         sh:minCount 0;
         sh:severity sh:Violation ;
-        sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dct:title property must point to a xsd:string field."@en ;
+        sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dct:title property must point to a language tagged field."@en ;
     ] ; 
 
     sh:property [
         a sh:PropertyShape ;
         sh:path odrl:hasPolicy ;
-        sh:class odrl:Policy ;
+	sh:class odrl:Offer ;
         sh:severity sh:Violation ;
         sh:minCount 0;
         sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): An odrl:hasPolicy property must point to an odrl:Policy."@en ;
     ] ;
 
-.
+.
diff --git a/catalog/message/shape/dcat-shapes.ttl b/catalog/message/shape/dcat-shapes.ttl
@@ -242,17 +242,17 @@ dspace_shapes:DataServiceShape
     sh:property [
         a sh:PropertyShape ;
         sh:path dcat:endpointDescription ;
-        sh:datatype xsd:string ;
+        sh:datatype xsd:anyURI ;
         sh:severity sh:Violation ;
         sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dcat-shapes.ttl> (DataServiceShape): A dcat:endpointDescription property must point to a xsd:string field."@en ;
     ] ;  
 
     sh:property [
         a sh:PropertyShape ;
         sh:path dcat:endpointURL ;
-        sh:datatype xsd:string ;
+        sh:datatype xsd:anyURI ;
         sh:severity sh:Violation ;
-        sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dcat-shapes.ttl> (DataServiceShape): A dcat:endpointURL property must point to a xsd:string field."@en ;
+        sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dcat-shapes.ttl> (DataServiceShape): A dcat:endpointURL property must point to a xsd:anyURI field."@en ;
     ] ;  
 
     sh:property [
@@ -264,4 +264,4 @@ dspace_shapes:DataServiceShape
         sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dcat-shapes.ttl> (DataServiceShape): A dcat:servesDataset property must point to a dcat:Dataset."@en ;
     ] ;
 
-.
+.
diff --git a/common/schema/context.json b/common/schema/context.json
@@ -55,7 +55,7 @@
     "odrl:leftOperand": { "@type": "@id" },
     "odrl:operator": { "@type": "@id" },
     "odrl:rightOperandReference": { "@type": "@id" },
-    "odrl:profile": { "@container": "@set" }
+    "odrl:profile": { "@container": "@set" },
     "odrl:assigner": { "@type": "@id" },
     "odrl:assignee": { "@type": "@id" }
   }

diff --git a/negotiation/message/example/contract-agreement-message.json b/negotiation/message/example/contract-agreement-message.json
@@ -19,5 +19,5 @@
       }]
     }]
   },
-  "dspace:callbackAddress": "https://......"
+  "dspace:callbackAddress": "https://example.com/callback"
 }
diff --git a/negotiation/message/example/contract-offer-message.json b/negotiation/message/example/contract-offer-message.json
@@ -18,5 +18,5 @@
       }]
     }]
   },
-  "dspace:callbackAddress": "https://......"
+  "dspace:callbackAddress": "https://example.com/callback"
 }
diff --git a/negotiation/message/example/contract-offer-message_initial.json b/negotiation/message/example/contract-offer-message_initial.json
@@ -5,7 +5,11 @@
   "dspace:offer": {
     "@type": "odrl:Offer",
     "@id": "urn:uuid:d526561f-528e-4d5a-ae12-9a9dd9b7a518",
-    "target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88"
+    "odrl:assigner": "urn:tsdshhs636378",
+    "target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
+    "odrl:permission": [{
+      "odrl:action": "odrl:use"
+    }]
   },
-  "dspace:callbackAddress": "https://......"
+  "dspace:callbackAddress": "https://example.com/callback"
 }
diff --git a/negotiation/message/example/contract-request-message.json b/negotiation/message/example/contract-request-message.json
@@ -4,6 +4,8 @@
   "dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
   "dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
   "dspace:offer": {
+    "@type": "odrl:Offer",
+    "@id": "urn:uuid:d526561f-528e-4d5a-ae12-9a9dd9b7a815",
     "odrl:target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
     "odrl:assigner": "urn:tsdshhs636378",
     "odrl:assignee": "urn:jashd766",
@@ -16,5 +18,5 @@
       }]
     }]
   },
-  "dspace:callbackAddress": "https://......"
+  "dspace:callbackAddress": "https://example.com/callback"
 }
diff --git a/negotiation/message/example/contract-request-message_initial.json b/negotiation/message/example/contract-request-message_initial.json
@@ -5,7 +5,11 @@
   "dspace:offer": {
     "@type": "odrl:Offer",
     "@id": "urn:uuid:2828282:3dd1add8-4d2d-569e-d634-8394a8836a89",
-    "odrl:target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88"
+    "odrl:target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
+    "odrl:assigner": "urn:tsdshhs636378",
+    "odrl:permission": [{
+      "odrl:action": "odrl:use"
+    }]
   },
-  "dspace:callbackAddress": "https://......"
+  "dspace:callbackAddress": "https://example.com/callback"
 }
diff --git a/negotiation/message/example/contract.agreement.message.http.transfer.json b/negotiation/message/example/contract.agreement.message.http.transfer.json
@@ -4,7 +4,7 @@
   "dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
   "dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
   "dspace:agreement": {
-    "@id": "some-other-id",
+    "@id": "urn:uuid:e8dc8655-44c2-46ef-b701-4cffdc2faa44",
     "@type": "odrl:Agreement",
     "odrl:target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
     "odrl:assignee": "...",
@@ -39,5 +39,6 @@
         ]
       }
     ]
-  }
+  },
+  "dspace:callbackAddress": "https://example.com/callback"
 }
diff --git a/negotiation/message/schema/contract-offer-message-schema.json b/negotiation/message/schema/contract-offer-message-schema.json
@@ -36,4 +36,4 @@
 			"required": [ "@context", "@type", "dspace:providerPid", "dspace:offer", "dspace:callbackAddress" ]
 		}
 	}
-}
+}
diff --git a/negotiation/message/schema/contract-request-message-schema.json b/negotiation/message/schema/contract-request-message-schema.json
@@ -36,4 +36,4 @@
 			"required": [ "@context", "@type", "dspace:consumerPid", "dspace:offer", "dspace:callbackAddress" ]
 		}
 	}
-}
+}
diff --git a/negotiation/message/schema/contract-schema.json b/negotiation/message/schema/contract-schema.json
@@ -68,8 +68,7 @@
                 "odrl:assignee": {
                     "type": "string"
                 }
-            },
-            "not": { "required": [ "odrl:target" ] }
+            }
         },
         "MessageOffer": {
             "type": "object",
@@ -153,7 +152,7 @@
             "required": [
                 "@type",
                 "@id",
-                "@target",
+                "odrl:target",
                 "odrl:assignee", 
                 "odrl:assigner"
             ]

diff --git a/negotiation/message/shape/contract-agreement-message-shape.ttl b/negotiation/message/shape/contract-agreement-message-shape.ttl
@@ -60,10 +60,10 @@ dspace_shapes:ContractAgreementMessageShape
 	sh:property [
 		a sh:PropertyShape ;
         sh:path dspace:callbackAddress ;
-        sh:datatype xsd:string ;
+        sh:datatype xsd:anyURI ;
 		sh:maxCount 1 ;
 		sh:minCount 1 ;
 		sh:severity sh:Violation ;
-		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-agreement-message-shape.ttl> (ContractAgreementMessageShape): An dspace:callbackAddress property must point to exactly one xsd:string value."@en ;
+		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-agreement-message-shape.ttl> (ContractAgreementMessageShape): An dspace:callbackAddress property must point to exactly one xsd:anyURI value."@en ;
 	]
 .
diff --git a/negotiation/message/shape/contract-offer-message-shape.ttl b/negotiation/message/shape/contract-offer-message-shape.ttl
@@ -60,10 +60,10 @@ dspace_shapes:ContractOfferMessageShape
 	sh:property [
 		a sh:PropertyShape ;
 		sh:path dspace:callbackAddress ;
-		sh:datatype xsd:string ;
+		sh:datatype xsd:anyURI ;
 		sh:maxCount 1 ;
 		sh:minCount 1 ;
 		sh:severity sh:Violation ;
-		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-offer-message-shape.ttl> (ContractOfferMessageShape): A dspace:callbackAddress property must point to exactly one xsd:string value."@en ;
+		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-offer-message-shape.ttl> (ContractOfferMessageShape): A dspace:callbackAddress property must point to exactly one xsd:anyURI value."@en ;
 	] ;
 .
diff --git a/negotiation/message/shape/contract-request-message-shape.ttl b/negotiation/message/shape/contract-request-message-shape.ttl
@@ -60,10 +60,10 @@ dspace_shapes:ContractRequestMessageShape
 	sh:property [
 		a sh:PropertyShape ;
 		sh:path dspace:callbackAddress ;
-		sh:datatype xsd:string ;
+		sh:datatype xsd:anyURI ;
 		sh:maxCount 1 ;
 		sh:minCount 1 ;
 		sh:severity sh:Violation ;
-		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-request-message-shape.ttl> (ContractRequestMessageShape): An dspace:callbackAddress property must point to exactly one xsd:string value."@en ;
+		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-request-message-shape.ttl> (ContractRequestMessageShape): An dspace:callbackAddress property must point to exactly one xsd:anyURI value."@en ;
 	] ;
 .
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,5 +19,5 @@ @@
           }]
         }]
       },
-      "dspace:callbackAddress": "https://......"
+      "dspace:callbackAddress": "https://example.com/callback"
     }