diff --git a/catalog/catalog.binding.https.md b/catalog/catalog.binding.https.md index 26696f29..9f72f2fc 100644 --- a/catalog/catalog.binding.https.md +++ b/catalog/catalog.binding.https.md @@ -36,9 +36,9 @@ POST https://provider.com/catalog/request Authorization: ... { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:CatalogRequest" - "ids:filter": {} + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:CatalogRequest" + "dspace:filter": {} } ``` @@ -93,7 +93,7 @@ and the HTTP `Link` header. The `Link` header will contain URLs for navigating t ``` Link: ; rel="next" { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@type": "dcat:Catalog" ... } @@ -140,10 +140,10 @@ POST https://provider.com/catalog/request Authorization: ... { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:CatalogRequest" + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:CatalogRequest" "@id: "..." - "ids:callbackAddress": "https://example.com/endpoint" + "dspace:callbackAddress": "https://example.com/endpoint" } ``` diff --git a/catalog/catalog.protocol.md b/catalog/catalog.protocol.md index e443c193..2cbf84b8 100644 --- a/catalog/catalog.protocol.md +++ b/catalog/catalog.protocol.md @@ -125,9 +125,9 @@ message to clients. A DataService may specify an IDS service endpoint such as a `Connector`. -#### 3.3.1 ids:dataServiceType +#### 3.3.1 dspace:dataServiceType -If the DataService refers to an IDS service endpoint, it must include the property `ids:dataServiceType`: +If the DataService refers to an IDS service endpoint, it must include the property `dspace:dataServiceType`: | Category | Description | |------------|----------------------------------------------------------------------------| @@ -140,7 +140,7 @@ The following table lists well-know IDS endpoint types: | Value | Description | |---------------|----------------------| -| ids:connector | A Connector endpoint | +| dspace:connector | A Connector endpoint | | | | #### 3.3.2 dcat:servesDataset diff --git a/catalog/message/catalog-error-message.json b/catalog/message/catalog-error-message.json index 8b9b64b7..4f661912 100644 --- a/catalog/message/catalog-error-message.json +++ b/catalog/message/catalog-error-message.json @@ -1,8 +1,8 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:CatalogErrorMessage", - "ids:code": "123:A", - "ids:reason": [ + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:CatalogErrorMessage", + "dspace:code": "123:A", + "dspace:reason": [ { "@value": "Catalog not provisioned for this requester.", "@language": "en" }, { "some": "other reason"} ] diff --git a/catalog/message/catalog-request-message.json b/catalog/message/catalog-request-message.json index 694aa3b2..472f92ba 100644 --- a/catalog/message/catalog-request-message.json +++ b/catalog/message/catalog-request-message.json @@ -1,5 +1,5 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:CatalogRequestMessage", - "ids:filter": {} + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:CatalogRequestMessage", + "dspace:filter": {} } diff --git a/catalog/message/catalog.json b/catalog/message/catalog.json index 9bfdb569..340bcc30 100644 --- a/catalog/message/catalog.json +++ b/catalog/message/catalog.json @@ -1,5 +1,5 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:3afeadd8-ed2d-569e-d634-8394a8836d57", "@type": "dcat:Catalog", "dct:title": "Data Provider A Catalog", @@ -12,7 +12,7 @@ { "@id": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77", "@type": "dcat:DataService", - "dct:terms": "ids:connector", + "dct:terms": "dspace:connector", "dct:endpointUrl": "https://provder-a.com/connector" } ], @@ -53,7 +53,7 @@ "dcat:distribution": [ { "@type": "dcat:Distribution", - "dct:format": "ids:s3+push", + "dct:format": "dspace:s3+push", "dcat:accessService": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77" } ] diff --git a/catalog/message/dataset-request-message.json b/catalog/message/dataset-request-message.json index b32f44ce..dd06df2a 100644 --- a/catalog/message/dataset-request-message.json +++ b/catalog/message/dataset-request-message.json @@ -1,5 +1,5 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:DatasetRequestMessage", - "ids:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88" + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:DatasetRequestMessage", + "dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88" } diff --git a/catalog/message/diagram/catalog-error-message.png b/catalog/message/diagram/catalog-error-message.png index 5f52db97..23f8b22a 100644 Binary files a/catalog/message/diagram/catalog-error-message.png and b/catalog/message/diagram/catalog-error-message.png differ diff --git a/catalog/message/diagram/catalog-error-message.puml b/catalog/message/diagram/catalog-error-message.puml index 93b2c092..19fdf4b6 100644 --- a/catalog/message/diagram/catalog-error-message.puml +++ b/catalog/message/diagram/catalog-error-message.puml @@ -6,11 +6,11 @@ hide empty description -class "ids:CatalogErrorMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:CatalogErrorMessage" - ids:code : String - ids:reason : Array +class "dspace:CatalogErrorMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:CatalogErrorMessage" + dspace:code : String + dspace:reason : Array } @enduml \ No newline at end of file diff --git a/catalog/message/diagram/catalog-request-message.png b/catalog/message/diagram/catalog-request-message.png index e761ef82..9988f7da 100644 Binary files a/catalog/message/diagram/catalog-request-message.png and b/catalog/message/diagram/catalog-request-message.png differ diff --git a/catalog/message/diagram/catalog-request-message.puml b/catalog/message/diagram/catalog-request-message.puml index fe2a605f..3206b478 100644 --- a/catalog/message/diagram/catalog-request-message.puml +++ b/catalog/message/diagram/catalog-request-message.puml @@ -6,10 +6,10 @@ hide empty description -class "ids:CatalogRequestMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : ids:CatalogRequestMessage - ids:filter : Object +class "dspace:CatalogRequestMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : dspace:CatalogRequestMessage + dspace:filter : Object } @enduml \ No newline at end of file diff --git a/catalog/message/example/dcat.distribution.example.json b/catalog/message/example/dcat.distribution.example.json index 4d97eed5..1b834724 100644 --- a/catalog/message/example/dcat.distribution.example.json +++ b/catalog/message/example/dcat.distribution.example.json @@ -1,5 +1,5 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "http://provider.com/catalog1/dataset1/", "@type": "dcat:Dataset", "dct:title" : "IDS Dataset #1", @@ -37,17 +37,17 @@ "HTTP", "REST" ], - "ids:transportType": { - "@id": "ids:HTTP_REST" + "dspace:transportType": { + "@id": "dspace:HTTP_REST" }, "dcat:accessService": [ { - "@type": [ "dcat:DataService", "ids:NEGOTIATION_SERVICE" ], + "@type": [ "dcat:DataService", "dspace:NEGOTIATION_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", "@value": "https://provider.com/connector/negotiation" } }, { - "@type": [ "dcat:DataService", "ids:TRANSFER_SERVICE" ], + "@type": [ "dcat:DataService", "dspace:TRANSFER_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", "@value": "https://provider.com/connector/transfer" @@ -61,17 +61,17 @@ "S3", "public" ], - "ids:transportType": { - "@id": "ids:S3" + "dspace:transportType": { + "@id": "dspace:S3" }, "dcat:accessService": [ { - "@type": [ "dcat:DataService", "ids:NEGOTIATION_SERVICE" ], + "@type": [ "dcat:DataService", "dspace:NEGOTIATION_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", "@value": "https://provider.com/connector/negotiation" } }, { - "@type": [ "dcat:DataService", "ids:TRANSFER_SERVICE" ], + "@type": [ "dcat:DataService", "dspace:TRANSFER_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", "@value": "https://provider.com/connector/transfer" diff --git a/catalog/message/example/dcat.distribution.example.option1.json b/catalog/message/example/dcat.distribution.example.option1.json index 4924ec64..2fdde8c8 100644 --- a/catalog/message/example/dcat.distribution.example.option1.json +++ b/catalog/message/example/dcat.distribution.example.option1.json @@ -1,5 +1,5 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "http://provider.com/catalog1/dataset1/", "@type": "dcat:Dataset", "dct:title": "IDS Dataset Collection", @@ -14,7 +14,7 @@ } ], "dcat:keyword": [ - "IDS", + "data space", "data asset", "dcat dataset", "collection" @@ -28,14 +28,14 @@ "HTTP", "REST" ], - "ids:transportType": { - "@id": "ids:HTTP_REST" + "dspace:transportType": { + "@id": "dspace:HTTP_REST" }, "dcat:accessService": [ { "@type": [ "dcat:DataService", - "ids:NEGOTIATION_SERVICE" + "dspace:NEGOTIATION_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", @@ -45,7 +45,7 @@ { "@type": [ "dcat:DataService", - "ids:TRANSFER_SERVICE" + "dspace:TRANSFER_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", @@ -62,14 +62,14 @@ "S3", "public" ], - "ids:transportType": { - "@id": "ids:S3" + "dspace:transportType": { + "@id": "dspace:S3" }, "dcat:accessService": [ { "@type": [ "dcat:DataService", - "ids:NEGOTIATION_SERVICE" + "dspace:NEGOTIATION_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", @@ -79,7 +79,7 @@ { "@type": [ "dcat:DataService", - "ids:TRANSFER_SERVICE" + "dspace:TRANSFER_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", @@ -114,9 +114,9 @@ { "odrl:and": [ { - "odrl:leftOperand": "ids:TRANSPORT", + "odrl:leftOperand": "dspace:TRANSPORT", "odrl:operator": "odrl:eq", - "odrl:rightOperand": "ids:S3" + "odrl:rightOperand": "dspace:S3" }, { "odrl:leftOperand": "odrl:payAmount", @@ -134,9 +134,9 @@ { "odrl:and": [ { - "odrl:leftOperand": "ids:TRANSPORT", + "odrl:leftOperand": "dspace:TRANSPORT", "odrl:operator": "odrl:eq", - "odrl:rightOperand": "ids:HTTP_REST" + "odrl:rightOperand": "dspace:HTTP_REST" }, { "odrl:leftOperand": "odrl:payAmount", diff --git a/catalog/message/example/dcat.distribution.example.option2.json b/catalog/message/example/dcat.distribution.example.option2.json index c2cab630..93b70f42 100644 --- a/catalog/message/example/dcat.distribution.example.option2.json +++ b/catalog/message/example/dcat.distribution.example.option2.json @@ -1,5 +1,5 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "http://provider.com/catalog1/dataset1/", "@type": "dcat:Dataset", "dct:title" : "IDS Dataset Collection", @@ -11,7 +11,7 @@ "@value": "Dieses Dataset bezeichnet alle Assets, deren Identifier dem Pattern 'urn:guid:[A-F0-9]{8}\\-[A-F0-9]{4}\\-[A-F0-9]{4}\\-[A-F0-9]{4}\\-[A-F0-9]{12}' folgen. Ein Transfer via S3 kostet etwa 5 Euro, wohingegen der Transfer via HTTP_RESt nur mit etwa 2 Euro zu Buche schlägt.. Der Consumer muss ein TRUST_PLUS zertifizierter Connetor sein. Eine Weiterverbreitung ist nicht gestattet." } ], "dcat:keyword": [ - "IDS", + "data space", "data asset", "dcat dataset", "collection" @@ -24,8 +24,8 @@ "HTTP", "REST" ], - "ids:transportType": { - "@id": "ids:HTTP_REST" + "dspace:transportType": { + "@id": "dspace:HTTP_REST" }, "odrl:hasPolicy": { "@type": "odrl:Offer", @@ -40,9 +40,9 @@ "odrl:duty": [ { "odrl:action": {"@id": "odrl:compensate"}, "odrl:constraint": [ { - "odrl:leftOperand": "ids:TRANSPORT", + "odrl:leftOperand": "dspace:TRANSPORT", "odrl:operator": "odrl:eq", - "odrl:rightOperand": "ids:HTTP_REST" + "odrl:rightOperand": "dspace:HTTP_REST" }, { "odrl:leftOperand": "odrl:payAmount", "odrl:operator": "odrl:eq", @@ -61,13 +61,13 @@ } ] }, "dcat:accessService": [ { - "@type": [ "dcat:DataService", "ids:NEGOTIATION_SERVICE" ], + "@type": [ "dcat:DataService", "dspace:NEGOTIATION_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", "@value": "https://provider.com/connector/negotiation" } }, { - "@type": [ "dcat:DataService", "ids:TRANSFER_SERVICE" ], + "@type": [ "dcat:DataService", "dspace:TRANSFER_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", "@value": "https://provider.com/connector/transfer" @@ -81,8 +81,8 @@ "S3", "public" ], - "ids:transportType": { - "@id": "ids:S3" + "dspace:transportType": { + "@id": "dspace:S3" }, "odrl:hasPolicy": { "@type": "odrl:Offer", @@ -97,9 +97,9 @@ "odrl:duty": [ { "odrl:action": {"@id": "odrl:compensate"}, "odrl:constraint": [ { - "odrl:leftOperand": "ids:TRANSPORT", + "odrl:leftOperand": "dspace:TRANSPORT", "odrl:operator": "odrl:eq", - "odrl:rightOperand": "ids:S3" + "odrl:rightOperand": "dspace:S3" }, { "odrl:leftOperand": "odrl:payAmount", "odrl:operator": "odrl:eq", @@ -118,13 +118,13 @@ } ] }, "dcat:accessService": [ { - "@type": [ "dcat:DataService", "ids:NEGOTIATION_SERVICE" ], + "@type": [ "dcat:DataService", "dspace:NEGOTIATION_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", "@value": "https://provider.com/connector/negotiation" } }, { - "@type": [ "dcat:DataService", "ids:TRANSFER_SERVICE" ], + "@type": [ "dcat:DataService", "dspace:TRANSFER_SERVICE" ], "dcat:endpointURL": { "@type": "xsd:anyURI", "@value": "https://provider.com/connector/transfer" diff --git a/catalog/message/schema/catalog-error-message-schema.json b/catalog/message/schema/catalog-error-message-schema.json index 945d94f9..2ceb719d 100644 --- a/catalog/message/schema/catalog-error-message-schema.json +++ b/catalog/message/schema/catalog-error-message-schema.json @@ -7,19 +7,19 @@ "$ref": "#/definitions/CatalogErrorMessage" } ], - "$id": "https://w3id.org/idsa/schemas/v5/CatalogErrorMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/CatalogErrorMessageSchema", "definitions": { "CatalogErrorMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:CatalogErrorMessage", + "const": "dspace:CatalogErrorMessage", "required": true } } diff --git a/catalog/message/schema/catalog-message-schema.json b/catalog/message/schema/catalog-message-schema.json index afff2f86..48c0474a 100644 --- a/catalog/message/schema/catalog-message-schema.json +++ b/catalog/message/schema/catalog-message-schema.json @@ -7,25 +7,25 @@ "$ref": "#/definitions/CatalogMessage" } ], - "$id": "https://w3id.org/idsa/schemas/v5/CatalogMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/CatalogMessageSchema", "definitions": { "CatalogMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:CatalogMessage", + "const": "dspace:CatalogMessage", "required": true }, - "ids:catalog": { + "dspace:catalog": { "type": "array", "items": { - "$ref": "https://w3id.org/idsa/schemas/v5/CatalogSchema#definitions/Catalog" + "$ref": "https://w3id.org/dspace/schemas/1/0/CatalogSchema#definitions/Catalog" } } } diff --git a/catalog/message/schema/catalog-request-message-schema.json b/catalog/message/schema/catalog-request-message-schema.json index 6f340066..0dc05067 100644 --- a/catalog/message/schema/catalog-request-message-schema.json +++ b/catalog/message/schema/catalog-request-message-schema.json @@ -7,26 +7,26 @@ "$ref": "#/definitions/CatalogRequestMessage" } ], - "$id": "https://w3id.org/idsa/schemas/v5/CatalogRequestMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/CatalogRequestMessageSchema", "definitions": { "CatalogRequestMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:CatalogRequestMessage", + "const": "dspace:CatalogRequestMessage", "required": true }, - "ids:filter": { + "dspace:filter": { "type": "array", "items": { "@type": "string", - "const": "ids:Filter" + "const": "dspace:Filter" } } } diff --git a/catalog/message/schema/catalog-schema.json b/catalog/message/schema/catalog-schema.json index d256eaa1..5dca6423 100644 --- a/catalog/message/schema/catalog-schema.json +++ b/catalog/message/schema/catalog-schema.json @@ -7,14 +7,14 @@ "$ref": "#/definitions/Catalog" } ], - "$id": "https://w3id.org/idsa/schemas/v5/CatalogSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/CatalogSchema", "definitions": { "Catalog": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { diff --git a/catalog/message/schema/dataset-request-message-schema.json b/catalog/message/schema/dataset-request-message-schema.json index f220900d..7d7d11e7 100644 --- a/catalog/message/schema/dataset-request-message-schema.json +++ b/catalog/message/schema/dataset-request-message-schema.json @@ -7,22 +7,22 @@ "$ref": "#/definitions/DatasetRequestMessage" } ], - "$id": "https://w3id.org/idsa/schemas/v5/DatasetRequestMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/DatasetRequestMessageSchema", "definitions": { "DatasetRequestMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:DatasetRequestMessage", + "const": "dspace:DatasetRequestMessage", "required": true }, - "ids:dataset": { + "dspace:dataset": { "type": "string", "required": true } diff --git a/catalog/message/shape/catalog-error-message-shape.ttl b/catalog/message/shape/catalog-error-message-shape.ttl index 332fd467..68604303 100644 --- a/catalog/message/shape/catalog-error-message-shape.ttl +++ b/catalog/message/shape/catalog-error-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,14 +20,14 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:CatalogErrorMessageShape a sh:NodeShape ; - sh:targetClass ids:CatalogErrorMessage ; + sh:targetClass dspace:CatalogErrorMessage ; . \ No newline at end of file diff --git a/catalog/message/shape/catalog-message-shape.ttl b/catalog/message/shape/catalog-message-shape.ttl index f80e71ac..58fccfda 100644 --- a/catalog/message/shape/catalog-message-shape.ttl +++ b/catalog/message/shape/catalog-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,20 +20,20 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:CatalogMessageShape a sh:NodeShape ; - sh:targetClass ids:CatalogMessage ; + sh:targetClass dspace:CatalogMessage ; sh:property [ a sh:PropertyShape ; - sh:path ids:catalog ; + sh:path dspace:catalog ; sh:class dcat:Catalog ; sh:severity sh:Violation ; - sh:message " (CatalogMessageShape): An ids:catalog property must point zero or more instances of the dcat:Catalog class."@en ; + sh:message " (CatalogMessageShape): An dspace:catalog property must point zero or more instances of the dcat:Catalog class."@en ; ] ; . \ No newline at end of file diff --git a/catalog/message/shape/catalog-request-message-shape.ttl b/catalog/message/shape/catalog-request-message-shape.ttl index 3fa28f7a..0c60be79 100644 --- a/catalog/message/shape/catalog-request-message-shape.ttl +++ b/catalog/message/shape/catalog-request-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,20 +20,20 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:CatalogRequestMessageShape a sh:NodeShape ; - sh:targetClass ids:CatalogRequestMessage ; + sh:targetClass dspace:CatalogRequestMessage ; sh:property [ a sh:PropertyShape ; - sh:path ids:filter ; - sh:class ids:Filter ; + sh:path dspace:filter ; + sh:class dspace:Filter ; sh:severity sh:Violation ; - sh:message " (CatalogRequestMessageShape): An ids:filter property must point zero or more instances of the ids:Filter class."@en ; + sh:message " (CatalogRequestMessageShape): An dspace:filter property must point zero or more instances of the dspace:Filter class."@en ; ] ; . \ No newline at end of file diff --git a/catalog/message/shape/catalog-shape.ttl b/catalog/message/shape/catalog-shape.ttl index 216232d7..6da27e78 100644 --- a/catalog/message/shape/catalog-shape.ttl +++ b/catalog/message/shape/catalog-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,8 +20,8 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . diff --git a/catalog/message/shape/dataset-request-message-shape.ttl b/catalog/message/shape/dataset-request-message-shape.ttl index fd1c07f3..3dc3ddf6 100644 --- a/catalog/message/shape/dataset-request-message-shape.ttl +++ b/catalog/message/shape/dataset-request-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,22 +20,22 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:CatalogRequestMessageShape a sh:NodeShape ; - sh:targetClass ids:catalog-request-message-shape.ttl ; + sh:targetClass dspace:catalog-request-message-shape.ttl ; sh:property [ a sh:PropertyShape ; - sh:path ids:dataset ; + sh:path dspace:dataset ; sh:class datatype:string ; sh:minCount 1 ; sh:maxCount 1 ; sh:severity sh:Violation ; - sh:message " (DatasetRequestMessage): An ids:dataset property must point to one XSD:String class."@en ; + sh:message " (DatasetRequestMessage): An dspace:dataset property must point to one XSD:String class."@en ; ] ; . diff --git a/common/schema/context.json b/common/schema/context.json index bc5dcaae..cabbe145 100644 --- a/common/schema/context.json +++ b/common/schema/context.json @@ -1,6 +1,6 @@ { "@context": { - "ids": "https://w3id.org/idsa/core/", + "dspace": "https://w3id.org/dspace/1/0/", "odrl": "http://www.w3.org/ns/odrl/2/", "xsd": "http://www.w3.org/2001/XMLSchema#", "cred": "https://www.w3.org/2018/credentials#", diff --git a/common/shape/message-shape.ttl b/common/shape/message-shape.ttl index adb6f429..088c19f2 100644 --- a/common/shape/message-shape.ttl +++ b/common/shape/message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,22 +20,22 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:MessageShape a sh:NodeShape ; - sh:targetClass ids:Message ; + sh:targetClass dspace:Message ; sh:property [ a sh:PropertyShape ; - sh:path ids:processId ; + sh:path dspace:processId ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (MessageShape): An ids:processId property must point to exactly one xsd:string."@en ; + sh:message " (MessageShape): An dspace:processId property must point to exactly one xsd:string."@en ; ] ; . \ No newline at end of file diff --git a/common/shape/odrl-shapes.ttl b/common/shape/odrl-shapes.ttl index 6df1b9e2..8b255c4b 100644 --- a/common/shape/odrl-shapes.ttl +++ b/common/shape/odrl-shapes.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,8 +20,8 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . diff --git a/negotiation/contract.negotiation.binding.https.md b/negotiation/contract.negotiation.binding.https.md index 826df350..4ad226a5 100644 --- a/negotiation/contract.negotiation.binding.https.md +++ b/negotiation/contract.negotiation.binding.https.md @@ -52,10 +52,10 @@ the [ContractNegotiation](./message/contract-negotiation.json): ``` { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractNegotiation" + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractNegotiation" "@id": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "ids:state" :"CONSUMER_REQUESTED" + "dspace:state" :"CONSUMER_REQUESTED" } ``` @@ -76,12 +76,12 @@ POST https://connector.provider.com/negotiations/request Authorization: ... { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractRequest" + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractRequest" "@id": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "ids:dataSet": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88", - "ids:offerId": "urn:uuid:2828282:3dd1add8-4d2d-569e-d634-8394a8836a88", - "ids:callbackAddress": "https://......" + "dspace:dataSet": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88", + "dspace:offerId": "urn:uuid:2828282:3dd1add8-4d2d-569e-d634-8394a8836a88", + "dspace:callbackAddress": "https://......" } ``` @@ -100,10 +100,10 @@ the [ContractNegotiation](./message/contract-negotiation.json) message: Location: /negotiations/urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3 { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractNegotiation" + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractNegotiation" "@id": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "ids:state" :"CONSUMER_REQUESTED" + "dspace:state" :"CONSUMER_REQUESTED" } ``` @@ -121,15 +121,15 @@ POST https://connector.provider.com/negotiations/urn:uuid:dcbf434c-eacf-4582-9a0 Authorization: ... { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractRequestMessage", - "ids:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "ids:offer": { + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractRequestMessage", + "dspace:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", + "dspace:offer": { "@type": "odrl:Offer", "@id": "...", "target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88" }, - "ids:checksum": "..." + "dspace:checksum": "..." } ``` @@ -161,10 +161,10 @@ POST https://connector.provider.com/negotiations/urn:uuid:a343fcbf-99fc-4ce8-8e9 Authorization: ... { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractAgreementVerificationMessage", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:consumerSignature": { + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractAgreementVerificationMessage", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:consumerSignature": { "timestamp": 121212, "hash": "....", "signature": "" @@ -200,15 +200,15 @@ POST https://connector.consumer.com/callback/negotiations/urn:uuid:dcbf434c-eacf Authorization: ... { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractOfferMessage", - "ids:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "ids:offer": { + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractOfferMessage", + "dspace:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", + "dspace:offer": { "@type": "odrl:Offer", "@id": "...", "target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88" }, - "ids:checksum": "..." + "dspace:checksum": "..." } ``` @@ -228,15 +228,15 @@ POST https://connector.consumer.com/negotiations/urn:uuid:a343fcbf-99fc-4ce8-8e9 Authorization: ... { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractAgreementMessage", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:agreement": { + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractAgreementMessage", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:agreement": { "@type": "odrl:Agreement", "@id": "e8dc8655-44c2-46ef-b701-4cffdc2faa44" } }, - "ids:checksum": "..." + "dspace:checksum": "..." } ``` diff --git a/negotiation/message/contract-agreement-message.json b/negotiation/message/contract-agreement-message.json index f485822c..89e668ba 100644 --- a/negotiation/message/contract-agreement-message.json +++ b/negotiation/message/contract-agreement-message.json @@ -1,8 +1,8 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractAgreementMessage", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:agreement": { + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractAgreementMessage", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:agreement": { "@type": "odrl:Agreement", "@id": "e8dc8655-44c2-46ef-b701-4cffdc2faa44", "odrl:permission": { diff --git a/negotiation/message/contract-agreement-verification-message.json b/negotiation/message/contract-agreement-verification-message.json index 11f3db1c..67d6e079 100644 --- a/negotiation/message/contract-agreement-verification-message.json +++ b/negotiation/message/contract-agreement-verification-message.json @@ -1,10 +1,10 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractAgreementVerificationMessage", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractAgreementVerificationMessage", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", "cred:credentialSubject": { - "@type": "ids:ContractAgreementMessage", - "ids:hash": "abcdefghijk12345" + "@type": "dspace:ContractAgreementMessage", + "dspace:hash": "abcdefghijk12345" }, "sec:proof": [ { diff --git a/negotiation/message/contract-negotiation-error.json b/negotiation/message/contract-negotiation-error.json index 329dc22a..0fab342d 100644 --- a/negotiation/message/contract-negotiation-error.json +++ b/negotiation/message/contract-negotiation-error.json @@ -1,9 +1,9 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractNegotiationError", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:code": "...", - "ids:reason": [ + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractNegotiationError", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:code": "...", + "dspace:reason": [ { "@value": "Catalog not provisioned for this requester.", "@language": "en" }, { "some": "other reason"} ], diff --git a/negotiation/message/contract-negotiation-event-message.json b/negotiation/message/contract-negotiation-event-message.json index 53a55a17..bdc75248 100644 --- a/negotiation/message/contract-negotiation-event-message.json +++ b/negotiation/message/contract-negotiation-event-message.json @@ -1,7 +1,7 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractNegotiationEventMessage", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:eventType": "ACCEPTED", - "ids:checksum": "1ad23hs6" + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractNegotiationEventMessage", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:eventType": "ACCEPTED", + "dspace:checksum": "1ad23hs6" } diff --git a/negotiation/message/contract-negotiation-termination-message.json b/negotiation/message/contract-negotiation-termination-message.json index 65c1e16f..626047e7 100644 --- a/negotiation/message/contract-negotiation-termination-message.json +++ b/negotiation/message/contract-negotiation-termination-message.json @@ -1,9 +1,9 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractNegotiationTerminationMessage", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:code": "...", - "ids:reason": [ + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractNegotiationTerminationMessage", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:code": "...", + "dspace:reason": [ { "@value": "License model does not fit.", "@language": "en" diff --git a/negotiation/message/contract-negotiation.json b/negotiation/message/contract-negotiation.json index 1c4b8a1f..0dfb95e0 100644 --- a/negotiation/message/contract-negotiation.json +++ b/negotiation/message/contract-negotiation.json @@ -1,8 +1,8 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "@type": "ids:ContractNegotiation", - "ids:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "ids:state": "CONSUMER_REQUESTED", - "ids:checksum": "..." + "@type": "dspace:ContractNegotiation", + "dspace:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", + "dspace:state": "CONSUMER_REQUESTED", + "dspace:checksum": "..." } \ No newline at end of file diff --git a/negotiation/message/contract-offer-message.json b/negotiation/message/contract-offer-message.json index 5ec47cf3..684c78ac 100644 --- a/negotiation/message/contract-offer-message.json +++ b/negotiation/message/contract-offer-message.json @@ -1,12 +1,12 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:ContractOfferMessage", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:offer": { + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:ContractOfferMessage", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:offer": { "@type": "odrl:Offer", "@id": "...", "target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88" }, - "ids:callbackAddress": "https://......", - "ids:checksum": "..." + "dspace:checksum": "...", + "dspace:callbackAddress": "https://......" } diff --git a/negotiation/message/contract-request-message.json b/negotiation/message/contract-request-message.json index 967593c8..50a7a875 100644 --- a/negotiation/message/contract-request-message.json +++ b/negotiation/message/contract-request-message.json @@ -1,14 +1,14 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "@type": "ids:ContractRequestMessage", - "ids:dataSet": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88", - "ids:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", - "ids:offer": { + "@type": "dspace:ContractRequestMessage", + "dspace:dataSet": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88", + "dspace:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3", + "dspace:offer": { "@type": "odrl:Offer", "@id": "urn:uuid:2828282:3dd1add8-4d2d-569e-d634-8394a8836a89", "odrl:target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88", ... }, - "ids:callbackAddress": "https://......" + "dspace:callbackAddress": "https://......" } diff --git a/negotiation/message/diagram/contract-agreement-message.png b/negotiation/message/diagram/contract-agreement-message.png index fe25d7c2..b6fb022f 100644 Binary files a/negotiation/message/diagram/contract-agreement-message.png and b/negotiation/message/diagram/contract-agreement-message.png differ diff --git a/negotiation/message/diagram/contract-agreement-message.puml b/negotiation/message/diagram/contract-agreement-message.puml index 92d259d5..fda585ab 100644 --- a/negotiation/message/diagram/contract-agreement-message.puml +++ b/negotiation/message/diagram/contract-agreement-message.puml @@ -6,12 +6,12 @@ hide empty description -class "ids:ContractAgreementMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:ContractAgreementMessage" - ids:processId : String - ids:agreement : odrl:Agreement - ids:callbackAddress : xsd:anyURI +class "dspace:ContractAgreementMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:ContractAgreementMessage" + dspace:processId : String + dspace:agreement : odrl:Agreement + dspace:callbackAddress : xsd:anyURI } class odrl:Agreement { @@ -20,6 +20,6 @@ class odrl:Agreement { odrl:target : xsd:anyURI } -"ids:ContractAgreementMessage" "1" *-- "1" "odrl:Agreement" : "odrl:agreement" +"dspace:ContractAgreementMessage" "1" *-- "1" "odrl:Agreement" : "odrl:agreement" @enduml \ No newline at end of file diff --git a/negotiation/message/diagram/contract-agreement-verification-message.png b/negotiation/message/diagram/contract-agreement-verification-message.png index 3f9b0103..bb715dee 100644 Binary files a/negotiation/message/diagram/contract-agreement-verification-message.png and b/negotiation/message/diagram/contract-agreement-verification-message.png differ diff --git a/negotiation/message/diagram/contract-agreement-verification-message.puml b/negotiation/message/diagram/contract-agreement-verification-message.puml index eeca5415..a54348e4 100644 --- a/negotiation/message/diagram/contract-agreement-verification-message.puml +++ b/negotiation/message/diagram/contract-agreement-verification-message.puml @@ -6,17 +6,17 @@ hide empty description -class "ids:ContractAgreementVerificationMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:ContractAgreementVerificationMessage" - ids:processId : String - cred:credentialSubject : ids:ContractAgreementMessage +class "dspace:ContractAgreementVerificationMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:ContractAgreementVerificationMessage" + dspace:processId : String + cred:credentialSubject : dspace:ContractAgreementMessage sec:proof : sec:Proof } -class ids:ContractAgreementMessage { - @type : "ids:ContractAgreementMessage" - ids:hash : String +class dspace:ContractAgreementMessage { + @type : "dspace:ContractAgreementMessage" + dspace:hash : String } class sec:Proof { @@ -37,8 +37,8 @@ enum Signature { sec:BbsBlsSignatureProof2020 } -"ids:ContractAgreementVerificationMessage" "1" *-- "1" "ids:ContractAgreementMessage" : "cred:credentialSubject" -"ids:ContractAgreementVerificationMessage" "1" *-- "0..2" "sec:Proof" : "sec:proof" +"dspace:ContractAgreementVerificationMessage" "1" *-- "1" "dspace:ContractAgreementMessage" : "cred:credentialSubject" +"dspace:ContractAgreementVerificationMessage" "1" *-- "0..2" "sec:Proof" : "sec:proof" "sec:Proof" "1" *-- "1" Signature : @type @enduml \ No newline at end of file diff --git a/negotiation/message/diagram/contract-negotiation-error.png b/negotiation/message/diagram/contract-negotiation-error.png index 51d8027f..d51a7a86 100644 Binary files a/negotiation/message/diagram/contract-negotiation-error.png and b/negotiation/message/diagram/contract-negotiation-error.png differ diff --git a/negotiation/message/diagram/contract-negotiation-error.puml b/negotiation/message/diagram/contract-negotiation-error.puml index 75f4fb2f..f6e06177 100644 --- a/negotiation/message/diagram/contract-negotiation-error.puml +++ b/negotiation/message/diagram/contract-negotiation-error.puml @@ -6,12 +6,12 @@ hide empty description -class "ids:ContractNegotiationError" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:ContractNegotiationError" - ids:processId : String - ids:code : String - ids:reason : Array +class "dspace:ContractNegotiationError" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:ContractNegotiationError" + dspace:processId : String + dspace:code : String + dspace:reason : Array dct:description : MultilanguageProperty } @@ -20,6 +20,6 @@ class "MultilanguageProperty" { @value: String } -"ids:ContractNegotiationError" "1" *-- "*" "MultilanguageProperty" : "dct:description" +"dspace:ContractNegotiationError" "1" *-- "*" "MultilanguageProperty" : "dct:description" @enduml \ No newline at end of file diff --git a/negotiation/message/diagram/contract-negotiation-event-message.png b/negotiation/message/diagram/contract-negotiation-event-message.png index f8fe08c5..f0711ad4 100644 Binary files a/negotiation/message/diagram/contract-negotiation-event-message.png and b/negotiation/message/diagram/contract-negotiation-event-message.png differ diff --git a/negotiation/message/diagram/contract-negotiation-event-message.puml b/negotiation/message/diagram/contract-negotiation-event-message.puml index b037eb03..2fa523ff 100644 --- a/negotiation/message/diagram/contract-negotiation-event-message.puml +++ b/negotiation/message/diagram/contract-negotiation-event-message.puml @@ -6,19 +6,19 @@ hide empty description -class "ids:ContractNegotiationEventMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:ContractNegotiationEventMessage" - ids:processId : String - ids:eventType : ids:NegotiationEvent - ids:checksum : String +class "dspace:ContractNegotiationEventMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:ContractNegotiationEventMessage" + dspace:processId : String + dspace:eventType : dspace:NegotiationEvent + dspace:checksum : String } -enum ids:NegotiationEvent { - ids:ACCEPTED - ids:FINALIZED +enum dspace:NegotiationEvent { + dspace:ACCEPTED + dspace:FINALIZED } -"ids:ContractNegotiationEventMessage" "1" *-- "1" "ids:NegotiationEvent" : "ids:eventType" +"dspace:ContractNegotiationEventMessage" "1" *-- "1" "dspace:NegotiationEvent" : "dspace:eventType" @enduml \ No newline at end of file diff --git a/negotiation/message/diagram/contract-negotiation-termination-message.png b/negotiation/message/diagram/contract-negotiation-termination-message.png index 35fcb322..c9af2599 100644 Binary files a/negotiation/message/diagram/contract-negotiation-termination-message.png and b/negotiation/message/diagram/contract-negotiation-termination-message.png differ diff --git a/negotiation/message/diagram/contract-negotiation-termination-message.puml b/negotiation/message/diagram/contract-negotiation-termination-message.puml index e6980ac2..19b1ce9a 100644 --- a/negotiation/message/diagram/contract-negotiation-termination-message.puml +++ b/negotiation/message/diagram/contract-negotiation-termination-message.puml @@ -6,12 +6,12 @@ hide empty description -class "ids:ContractNegotiationTerminationMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:ContractNegotiationTerminationMessage" - ids:processId : String - ids:code : Object - ids:reason : Array +class "dspace:ContractNegotiationTerminationMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:ContractNegotiationTerminationMessage" + dspace:processId : String + dspace:code : Object + dspace:reason : Array } @enduml \ No newline at end of file diff --git a/negotiation/message/diagram/contract-negotiation.png b/negotiation/message/diagram/contract-negotiation.png index d0810a55..9bd6dd5c 100644 Binary files a/negotiation/message/diagram/contract-negotiation.png and b/negotiation/message/diagram/contract-negotiation.png differ diff --git a/negotiation/message/diagram/contract-negotiation.puml b/negotiation/message/diagram/contract-negotiation.puml index d5fc003f..b463333b 100644 --- a/negotiation/message/diagram/contract-negotiation.puml +++ b/negotiation/message/diagram/contract-negotiation.puml @@ -6,24 +6,24 @@ hide empty description -class "ids:ContractNegotiation" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:ContractNegotiation" - ids:processId : String - ids:state : ids:ContractNegotiationState +class "dspace:ContractNegotiation" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:ContractNegotiation" + dspace:processId : String + dspace:state : dspace:ContractNegotiationState } -enum ids:ContractNegotiationState { - "ids:CONSUMER_REQUESTED" - "ids:PROVIDER_OFFERED" - "ids:CONSUMER_AGREED" - "ids:PROVIDER_AGREED" - "ids:CONSUMER_VERIFIED" - "ids:PROVIDER_FINALIZED" - "ids:TERMINATED" +enum dspace:ContractNegotiationState { + "dspace:CONSUMER_REQUESTED" + "dspace:PROVIDER_OFFERED" + "dspace:CONSUMER_AGREED" + "dspace:PROVIDER_AGREED" + "dspace:CONSUMER_VERIFIED" + "dspace:PROVIDER_FINALIZED" + "dspace:TERMINATED" "..." } -"ids:ContractNegotiation" "1" *-- "1" "ids:ContractNegotiationState" : "ids:contractNegotiationState" +"dspace:ContractNegotiation" "1" *-- "1" "dspace:ContractNegotiationState" : "dspace:contractNegotiationState" @enduml \ No newline at end of file diff --git a/negotiation/message/diagram/contract-offer-message.png b/negotiation/message/diagram/contract-offer-message.png index b4eb31c3..169b1639 100644 Binary files a/negotiation/message/diagram/contract-offer-message.png and b/negotiation/message/diagram/contract-offer-message.png differ diff --git a/negotiation/message/diagram/contract-offer-message.puml b/negotiation/message/diagram/contract-offer-message.puml index afb7898c..4c463020 100644 --- a/negotiation/message/diagram/contract-offer-message.puml +++ b/negotiation/message/diagram/contract-offer-message.puml @@ -6,13 +6,13 @@ hide empty description -class "ids:ContractOfferMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : ids:ContractOfferMessage - ids:processId : String - ids:offer : odrl:Offer - ids:callbackAddress : String - ids:checksum: String +class "dspace:ContractOfferMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : dspace:ContractOfferMessage + dspace:processId : String + dspace:offer : odrl:Offer + dspace:callbackAddress : String + dspace:checksum: String } class odrl:Offer { @@ -21,6 +21,6 @@ class odrl:Offer { odrl:target : xsd:anyURI } -"ids:ContractOfferMessage" "1" *-- "1" "odrl:Offer" : "ids:offer" +"dspace:ContractOfferMessage" "1" *-- "1" "odrl:Offer" : "dspace:offer" @enduml \ No newline at end of file diff --git a/negotiation/message/diagram/contract-request-message.png b/negotiation/message/diagram/contract-request-message.png index 37e1e3c3..ae6128a4 100644 Binary files a/negotiation/message/diagram/contract-request-message.png and b/negotiation/message/diagram/contract-request-message.png differ diff --git a/negotiation/message/diagram/contract-request-message.puml b/negotiation/message/diagram/contract-request-message.puml index 212c9fd4..89cf4520 100644 --- a/negotiation/message/diagram/contract-request-message.puml +++ b/negotiation/message/diagram/contract-request-message.puml @@ -6,13 +6,13 @@ hide empty description -class "ids:ContractRequestMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : ids:ContractRequestMessage - ids:dataSet : String - ids:processId : String - ids:offer : odrl:Offer - ids:callbackAddress : String +class "dspace:ContractRequestMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : dspace:ContractRequestMessage + dspace:dataSet : String + dspace:processId : String + dspace:offer : odrl:Offer + dspace:callbackAddress : String } class odrl:Offer { @@ -21,6 +21,6 @@ class odrl:Offer { odrl:target : xsd:anyURI } -"ids:ContractRequestMessage" "1" *-- "1" "odrl:Offer" : "ids:offer" +"dspace:ContractRequestMessage" "1" *-- "1" "odrl:Offer" : "dspace:offer" @enduml \ No newline at end of file diff --git a/negotiation/message/example/contract.agreement.message.http.transfer.json b/negotiation/message/example/contract.agreement.message.http.transfer.json index 074ff76d..92e9d7dc 100644 --- a/negotiation/message/example/contract.agreement.message.http.transfer.json +++ b/negotiation/message/example/contract.agreement.message.http.transfer.json @@ -1,9 +1,9 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "some-id", - "@type": ["ids:ContractAgreementMessage"], - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:agreement": { + "@type": ["dspace:ContractAgreementMessage"], + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:agreement": { "@type": "odrl:Agreement", "@id": "some-other-id", "odrl:target": { "@id": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88" }, @@ -11,18 +11,18 @@ "@id": "some-permission-id", "odrl:action": { "@id": "odrl:use" }, "odrl:constraint": { - "odrl:leftOperand": { "@id": "ids:TRANSPORT" }, + "odrl:leftOperand": { "@id": "dspace:TRANSPORT" }, "odrl:operand": { "@id": "odrl:equals" }, - "oderl:rightOperand": { "@id": "ids:HTTP_REST" } + "oderl:rightOperand": { "@id": "dspace:HTTP_REST" } } }, "odrl:duty": { "@id": "some-permission-id", "odrl:action": { "@id": "odrl:use" }, "odrl:constraint": { - "odrl:leftOperand": { "@id": "ids:TRANSPORT" }, + "odrl:leftOperand": { "@id": "dspace:TRANSPORT" }, "odrl:operand": { "@id": "odrl:equals" }, - "oderl:rightOperand": { "@id": "ids:HTTP_REST" } + "oderl:rightOperand": { "@id": "dspace:HTTP_REST" } } } } diff --git a/negotiation/message/schema/contract-agreement-message-schema.json b/negotiation/message/schema/contract-agreement-message-schema.json index a75248a4..4679a6ae 100644 --- a/negotiation/message/schema/contract-agreement-message-schema.json +++ b/negotiation/message/schema/contract-agreement-message-schema.json @@ -7,27 +7,27 @@ "$ref": "#/definitions/ContractAgreementMessage" } ], - "$id": "https://w3id.org/idsa/schemas/v5/ContractAgreementMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/ContractAgreementMessageSchema", "definitions": { "ContractAgreementMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:ContractAgreementMessage", + "const": "dspace:ContractAgreementMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, "odrl:agreement": { - "$ref": "https://w3id.org/idsa/schemas/v5/AgreementSchema#definitions/Agreement", + "$ref": "https://w3id.org/dspace/schemas/1/0/AgreementSchema#definitions/Agreement", "required": true } } diff --git a/negotiation/message/schema/contract-agreement-verification-message-schema.json b/negotiation/message/schema/contract-agreement-verification-message-schema.json index 9cc8b497..355866ee 100644 --- a/negotiation/message/schema/contract-agreement-verification-message-schema.json +++ b/negotiation/message/schema/contract-agreement-verification-message-schema.json @@ -7,29 +7,29 @@ "$ref": "#/definitions/ContractAgreementVerificationMessage" } ], - "$id": "https://w3id.org/idsa/schemas/v5/ContractAgreementVerificationMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/ContractAgreementVerificationMessageSchema", "definitions": { "ContractAgreementVerificationMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json" + "const": "https://w3id.org/dspace/1/0/context.json" }, "@type": { "type": "string", - "const": "ids:ContractAgreementVerificationMessage" + "const": "dspace:ContractAgreementVerificationMessage" }, - "ids:processId": { + "dspace:processId": { "type": "string" }, "cred:subject": { "type": "object", "properties": { - "ids:hash": { + "dspace:hash": { "type": "string" }, - "required": [ "ids:hash" ] + "required": [ "dspace:hash" ] } }, "sec:proof": { @@ -61,7 +61,7 @@ "maxItems": 2 } }, - "required": [ "@context", "@type", "ids:processId", "cred:credentialSubject", "sec:proof" ] + "required": [ "@context", "@type", "dspace:processId", "cred:credentialSubject", "sec:proof" ] } } } \ No newline at end of file diff --git a/negotiation/message/schema/contract-negotiation-error-schema.json b/negotiation/message/schema/contract-negotiation-error-schema.json index 6a18ecda..4c6dc96a 100644 --- a/negotiation/message/schema/contract-negotiation-error-schema.json +++ b/negotiation/message/schema/contract-negotiation-error-schema.json @@ -7,26 +7,26 @@ "$ref": "#/definitions/ContractNegotiationError" } ], - "$id": "https://w3id.org/idsa/core/v5/ContractNegotiationErrorSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/ContractNegotiationErrorSchema", "definitions": { "ContractNegotiationError": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:ContractNegotiationError", + "const": "dspace:ContractNegotiationError", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:reason": { + "dspace:reason": { "type": "array", "minItems": 1, "items": { diff --git a/negotiation/message/schema/contract-negotiation-event-message-schema.json b/negotiation/message/schema/contract-negotiation-event-message-schema.json index 7ed25ce6..9c692d70 100644 --- a/negotiation/message/schema/contract-negotiation-event-message-schema.json +++ b/negotiation/message/schema/contract-negotiation-event-message-schema.json @@ -7,34 +7,34 @@ "$ref": "#/definitions/ContractNegotiationEventMessage" } ], - "$id": "https://w3id.org/idsa/core/v5/ContractNegotiationEventMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/ContractNegotiationEventMessageSchema", "definitions": { "ContractNegotiationEventMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:ContractNegotiationEventMessage", + "const": "dspace:ContractNegotiationEventMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:eventType": { + "dspace:eventType": { "type": "string", "enum": [ - "ids:ACCEPTED", - "ids:FINALIZED" + "dspace:ACCEPTED", + "dspace:FINALIZED" ], "required": true }, - "ids:checksum": { + "dspace:checksum": { "type": "string", "required": true } diff --git a/negotiation/message/schema/contract-negotiation-schema.json b/negotiation/message/schema/contract-negotiation-schema.json index b9f2a65a..cedda79c 100644 --- a/negotiation/message/schema/contract-negotiation-schema.json +++ b/negotiation/message/schema/contract-negotiation-schema.json @@ -7,26 +7,26 @@ "$ref": "#/definitions/ContractNegotiation" } ], - "$id": "https://w3id.org/idsa/core/v5/ContractNegotiationSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/ContractNegotiationSchema", "definitions": { "ContractNegotiation": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:ContractNegotiation", + "const": "dspace:ContractNegotiation", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:negotiationId": { + "dspace:negotiationId": { "type": "string", "required": true } diff --git a/negotiation/message/schema/contract-negotiation-termination-message-schema.json b/negotiation/message/schema/contract-negotiation-termination-message-schema.json index a6e6bcd4..5d33439a 100644 --- a/negotiation/message/schema/contract-negotiation-termination-message-schema.json +++ b/negotiation/message/schema/contract-negotiation-termination-message-schema.json @@ -7,30 +7,30 @@ "$ref": "#/definitions/ContractNegotiationTerminationMessage" } ], - "$id": "https://w3id.org/idsa/core/v5/ContractNegotiationTerminationMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/ContractNegotiationTerminationMessageSchema", "definitions": { "ContractNegotiationTerminationMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:ContractNegotiationTerminationMessage", + "const": "dspace:ContractNegotiationTerminationMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:code": { + "dspace:code": { "type": "string", "required": true }, - "ids:reason": { + "dspace:reason": { "type": "array", "required": false, "minItems": 1, diff --git a/negotiation/message/schema/contract-offer-message-schema.json b/negotiation/message/schema/contract-offer-message-schema.json index 09cf54c1..922c9917 100644 --- a/negotiation/message/schema/contract-offer-message-schema.json +++ b/negotiation/message/schema/contract-offer-message-schema.json @@ -7,34 +7,34 @@ "$ref": "#/definitions/ContractOfferMessage" } ], - "$id": "https://w3id.org/idsa/schemas/v5/ContractOfferMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/ContractOfferMessageSchema", "definitions": { "ContractOfferMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:ContractOfferMessage", + "const": "dspace:ContractOfferMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, "odrl:offer": { - "$ref": "https://w3id.org/idsa/schemas/v5/OfferSchema#definitions/Offer", + "$ref": "https://w3id.org/dspace/schemas/1/0/OfferSchema#definitions/Offer", "required": true }, - "ids:callbackAddress": { + "dspace:callbackAddress": { "type" : "string", "required": true }, - "ids:checksum": { + "dspace:checksum": { "type" : "string", "required": true } diff --git a/negotiation/message/schema/contract-request-message-schema.json b/negotiation/message/schema/contract-request-message-schema.json index 3159827f..feda7901 100644 --- a/negotiation/message/schema/contract-request-message-schema.json +++ b/negotiation/message/schema/contract-request-message-schema.json @@ -7,30 +7,30 @@ "$ref": "#/definitions/ContractRequestMessage" } ], - "$id": "https://w3id.org/idsa/schemas/v5/ContractRequestMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/ContractRequestMessageSchema", "definitions": { "ContractRequestMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:ContractRequestMessage", + "const": "dspace:ContractRequestMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, "odrl:offer": { - "$ref": "https://w3id.org/idsa/schemas/v5/OfferSchema#definitions/Offer", + "$ref": "https://w3id.org/dspace/schemas/1/0/OfferSchema#definitions/Offer", "required": true }, - "ids:callbackAddress": { + "dspace:callbackAddress": { "type" : "string", "required": true } diff --git a/negotiation/message/shape/contract-agreement-message-shape.ttl b/negotiation/message/shape/contract-agreement-message-shape.ttl index 490e637f..b6c78216 100644 --- a/negotiation/message/shape/contract-agreement-message-shape.ttl +++ b/negotiation/message/shape/contract-agreement-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,14 +20,14 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractAgreementMessageShape a sh:NodeShape ; - sh:targetClass ids:ContractAgreementMessage ; + sh:targetClass dspace:ContractAgreementMessage ; rdfs:subClassOf shapes:ContractNegotiationMessageShape ; sh:property [ diff --git a/negotiation/message/shape/contract-agreement-verification-message-shape.ttl b/negotiation/message/shape/contract-agreement-verification-message-shape.ttl index 8ff74d6f..7c1a544e 100644 --- a/negotiation/message/shape/contract-agreement-verification-message-shape.ttl +++ b/negotiation/message/shape/contract-agreement-verification-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,24 +20,24 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractAgreementVerificationMessageShape a sh:NodeShape ; - sh:targetClass ids:ContractAgreementVerificationMessage ; + sh:targetClass dspace:ContractAgreementVerificationMessage ; rdfs:subClassOf shapes:ContractNegotiationMessageShape ; sh:property [ a sh:PropertyShape ; sh:path cred:credentialSubject ; - sh:class ids:ContractAgreementMessage ; # TODO: Having the ContractAgreementMessage class(!) here but only with the property ids:hash is a bad idea, not safe for the schema engine. + sh:class dspace:ContractAgreementMessage ; # TODO: Having the ContractAgreementMessage class(!) here but only with the property dspace:hash is a bad idea, not safe for the schema engine. sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractAgreementVerificationMessageShape): An cred:credentialSubject property must point to exactly one ids:ContractAgreementMessage."@en ; + sh:message " (ContractAgreementVerificationMessageShape): An cred:credentialSubject property must point to exactly one dspace:ContractAgreementMessage."@en ; ] ; sh:property [ diff --git a/negotiation/message/shape/contract-negotiation-error-shape.ttl b/negotiation/message/shape/contract-negotiation-error-shape.ttl index 3cf0e6ce..93066f6a 100644 --- a/negotiation/message/shape/contract-negotiation-error-shape.ttl +++ b/negotiation/message/shape/contract-negotiation-error-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,21 +20,21 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractNegotiationErrorShape a sh:NodeShape ; - rdfs:subClassOf ids:ContractNegotiationMessageShape ; # TODO: Is a ContractNegotiationError really a Message? - sh:targetClass ids:ContractNegotiationError ; + rdfs:subClassOf dspace:ContractNegotiationMessageShape ; # TODO: Is a ContractNegotiationError really a Message? + sh:targetClass dspace:ContractNegotiationError ; sh:property [ a sh:PropertyShape ; sh:path dct:description ; sh:datatype rdf:langString ; sh:severity sh:Violation ; - sh:message " (ContractNegotiationErrorShape): A dct:description property must point from an ids:ContractNegotiationError to zero or more rdf:langString values."@en ; + sh:message " (ContractNegotiationErrorShape): A dct:description property must point from an dspace:ContractNegotiationError to zero or more rdf:langString values."@en ; ] . \ No newline at end of file diff --git a/negotiation/message/shape/contract-negotiation-event-message-shape.ttl b/negotiation/message/shape/contract-negotiation-event-message-shape.ttl index bc5fad1e..be51fd15 100644 --- a/negotiation/message/shape/contract-negotiation-event-message-shape.ttl +++ b/negotiation/message/shape/contract-negotiation-event-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,34 +20,34 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractNegotiationEventMessageShape a sh:NodeShape ; - sh:targetClass ids:ContractNegotiationEventMessage ; - rdfs:subClassOf ids:ContractNegotiationMessageShape ; + sh:targetClass dspace:ContractNegotiationEventMessage ; + rdfs:subClassOf dspace:ContractNegotiationMessageShape ; sh:property [ a sh:PropertyShape ; - sh:path ids:eventType ; - sh:class ids:NegotiationEvent ; + sh:path dspace:eventType ; + sh:class dspace:NegotiationEvent ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractNegotiationEventMessageShape): An ids:eventType property must point from an ids:ContractNegotiationEventMessage to exactly one ids:NegotiationEvent."@en ; + sh:message " (ContractNegotiationEventMessageShape): An dspace:eventType property must point from an dspace:ContractNegotiationEventMessage to exactly one dspace:NegotiationEvent."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:checksum ; + sh:path dspace:checksum ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractNegotiationEventMessageShape): An ids:checksum property must point from an ids:ContractNegotiationEventMessage to exactly one xsd:string."@en ; + sh:message " (ContractNegotiationEventMessageShape): An dspace:checksum property must point from an dspace:ContractNegotiationEventMessage to exactly one xsd:string."@en ; ] ; . \ No newline at end of file diff --git a/negotiation/message/shape/contract-negotiation-message-shape.ttl b/negotiation/message/shape/contract-negotiation-message-shape.ttl index 0b1107bd..11d6bc99 100644 --- a/negotiation/message/shape/contract-negotiation-message-shape.ttl +++ b/negotiation/message/shape/contract-negotiation-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,22 +20,22 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractNegotiationMessageShape a sh:NodeShape ; - sh:targetClass ids:ContractNegotiationMessage ; + sh:targetClass dspace:ContractNegotiationMessage ; sh:property [ a sh:PropertyShape ; - sh:path ids:processId ; + sh:path dspace:processId ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractNegotiationMessageShape): An ids:processId property must point to exactly one xsd:string."@en ; + sh:message " (ContractNegotiationMessageShape): An dspace:processId property must point to exactly one xsd:string."@en ; ] ; . \ No newline at end of file diff --git a/negotiation/message/shape/contract-negotiation-shape.ttl b/negotiation/message/shape/contract-negotiation-shape.ttl index 79b25af1..3ab3efc1 100644 --- a/negotiation/message/shape/contract-negotiation-shape.ttl +++ b/negotiation/message/shape/contract-negotiation-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,33 +20,33 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractNegotiationShape a sh:NodeShape ; - sh:targetClass ids:ContractNegotiation ; + sh:targetClass dspace:ContractNegotiation ; sh:property [ a sh:PropertyShape ; - sh:path ids:processId ; + sh:path dspace:processId ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractNegotiationShape): An ids:processId property must point from an ids:ContractNegotiation to exactly one xsd:string field."@en ; + sh:message " (ContractNegotiationShape): An dspace:processId property must point from an dspace:ContractNegotiation to exactly one xsd:string field."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:negotiationId ; + sh:path dspace:negotiationId ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractNegotiationShape): An ids:checksum property must point from an ids:negotiationId to exactly one xsd:string field."@en ; + sh:message " (ContractNegotiationShape): An dspace:checksum property must point from an dspace:negotiationId to exactly one xsd:string field."@en ; ] ; . \ No newline at end of file diff --git a/negotiation/message/shape/contract-negotiation-termination-message-shape.ttl b/negotiation/message/shape/contract-negotiation-termination-message-shape.ttl index 42ff6494..5917da1b 100644 --- a/negotiation/message/shape/contract-negotiation-termination-message-shape.ttl +++ b/negotiation/message/shape/contract-negotiation-termination-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,14 +20,14 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractNegotiationTerminationMessageShape a sh:NodeShape ; - sh:targetClass ids:ContractNegotiationTerminationMessage ; - rdfs:subClassOf ids:ContractNegotiationMessageShape ; + sh:targetClass dspace:ContractNegotiationTerminationMessage ; + rdfs:subClassOf dspace:ContractNegotiationMessageShape ; . \ No newline at end of file diff --git a/negotiation/message/shape/contract-offer-message-shape.ttl b/negotiation/message/shape/contract-offer-message-shape.ttl index e82468ec..155ea350 100644 --- a/negotiation/message/shape/contract-offer-message-shape.ttl +++ b/negotiation/message/shape/contract-offer-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,43 +20,43 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractOfferMessageShape a sh:NodeShape ; - sh:targetClass ids:ContractOfferMessage ; - rdfs:subClassOf ids:ContractNegotiationMessageShape ; + sh:targetClass dspace:ContractOfferMessage ; + rdfs:subClassOf dspace:ContractNegotiationMessageShape ; sh:property [ a sh:PropertyShape ; - sh:path ids:offer ; + sh:path dspace:offer ; sh:class odrl:Offer ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractOfferMessageShape): An ids:offer property must point to exactly one odrl:Offer class."@en ; + sh:message " (ContractOfferMessageShape): A dspace:offer property must point to exactly one odrl:Offer class."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:callbackAddress ; + sh:path dspace:callbackAddress ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractOfferMessageShape): An ids:callbackAddress property must point to exactly one xsd:string value."@en ; + sh:message " (ContractOfferMessageShape): A dspace:callbackAddress property must point to exactly one xsd:string value."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:checksum ; + sh:path dspace:checksum ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractOfferMessageShape): An ids:checksum property must point to exactly one xsd:string value."@en ; + sh:message " (ContractOfferMessageShape): A dspace:checksum property must point to exactly one xsd:string value."@en ; ] ; . \ No newline at end of file diff --git a/negotiation/message/shape/contract-request-message-shape.ttl b/negotiation/message/shape/contract-request-message-shape.ttl index 24bcc9ab..effafdac 100644 --- a/negotiation/message/shape/contract-request-message-shape.ttl +++ b/negotiation/message/shape/contract-request-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,33 +20,33 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:ContractRequestMessageShape a sh:NodeShape ; - sh:targetClass ids:ContractRequestMessage ; - rdfs:subClassOf ids:ContractNegotiationMessageShape ; + sh:targetClass dspace:ContractRequestMessage ; + rdfs:subClassOf dspace:ContractNegotiationMessageShape ; sh:property [ a sh:PropertyShape ; - sh:path ids:offer ; + sh:path dspace:offer ; sh:class odrl:Offer ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractRequestMessageShape): An ids:offer property must point to exactly one odrl:Offer class."@en ; + sh:message " (ContractRequestMessageShape): An dspace:offer property must point to exactly one odrl:Offer class."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:callbackAddress ; + sh:path dspace:callbackAddress ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (ContractRequestMessageShape): An ids:callbackAddress property must point to exactly one xsd:string value."@en ; + sh:message " (ContractRequestMessageShape): An dspace:callbackAddress property must point to exactly one xsd:string value."@en ; ] ; . \ No newline at end of file diff --git a/transfer/message/diagram/transfer-completion-message.png b/transfer/message/diagram/transfer-completion-message.png index 811ed634..e819b977 100644 Binary files a/transfer/message/diagram/transfer-completion-message.png and b/transfer/message/diagram/transfer-completion-message.png differ diff --git a/transfer/message/diagram/transfer-completion-message.puml b/transfer/message/diagram/transfer-completion-message.puml index 28934c76..ba6fab96 100644 --- a/transfer/message/diagram/transfer-completion-message.puml +++ b/transfer/message/diagram/transfer-completion-message.puml @@ -6,11 +6,11 @@ hide empty description -class "ids:TransferCompletionMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:TransferCompletionMessage" - ids:processId : String - ids:correlationId : String +class "dspace:TransferCompletionMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:TransferCompletionMessage" + dspace:processId : String + dspace:correlationId : String } @enduml \ No newline at end of file diff --git a/transfer/message/diagram/transfer-error.png b/transfer/message/diagram/transfer-error.png index eb839124..8c194589 100644 Binary files a/transfer/message/diagram/transfer-error.png and b/transfer/message/diagram/transfer-error.png differ diff --git a/transfer/message/diagram/transfer-error.puml b/transfer/message/diagram/transfer-error.puml index 6e9c5d0f..3c4ce1b8 100644 --- a/transfer/message/diagram/transfer-error.puml +++ b/transfer/message/diagram/transfer-error.puml @@ -6,13 +6,13 @@ hide empty description -class "ids:TransferError" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:TransferError" - ids:processId : String - ids:correlationId : String - ids:code : String - ids:reason : Array +class "dspace:TransferError" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:TransferError" + dspace:processId : String + dspace:correlationId : String + dspace:code : String + dspace:reason : Array } @enduml \ No newline at end of file diff --git a/transfer/message/diagram/transfer-process.png b/transfer/message/diagram/transfer-process.png index c8b3b188..25e43a03 100644 Binary files a/transfer/message/diagram/transfer-process.png and b/transfer/message/diagram/transfer-process.png differ diff --git a/transfer/message/diagram/transfer-process.puml b/transfer/message/diagram/transfer-process.puml index 22695bcd..6e1fa1b1 100644 --- a/transfer/message/diagram/transfer-process.puml +++ b/transfer/message/diagram/transfer-process.puml @@ -6,22 +6,22 @@ hide empty description -class "ids:TransferProcess" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:TransferProcess" - ids:correlationId : String - ids:state : ids:TransferState +class "dspace:TransferProcess" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:TransferProcess" + dspace:correlationId : String + dspace:state : dspace:TransferState } -enum ids:TransferState { - "ids:REQUESTED" - "ids:STARTED" - "ids:TERMINATED" - "ids:COMPLETED" - "ids:SUSPENDED" +enum dspace:TransferState { + "dspace:REQUESTED" + "dspace:STARTED" + "dspace:TERMINATED" + "dspace:COMPLETED" + "dspace:SUSPENDED" } -"ids:TransferProcess" "1" *-- "1" "ids:TransferState" : "ids:transferState" +"dspace:TransferProcess" "1" *-- "1" "dspace:TransferState" : "dspace:transferState" @enduml \ No newline at end of file diff --git a/transfer/message/diagram/transfer-request-message.png b/transfer/message/diagram/transfer-request-message.png index d5c011a8..246fd478 100644 Binary files a/transfer/message/diagram/transfer-request-message.png and b/transfer/message/diagram/transfer-request-message.png differ diff --git a/transfer/message/diagram/transfer-request-message.puml b/transfer/message/diagram/transfer-request-message.puml index c6cc2a89..6472f799 100644 --- a/transfer/message/diagram/transfer-request-message.puml +++ b/transfer/message/diagram/transfer-request-message.puml @@ -6,13 +6,13 @@ hide empty description -class "ids:TransferRequestMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:TransferRequestMessage" - ids:agreementId : String +class "dspace:TransferRequestMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:TransferRequestMessage" + dspace:agreementId : String dct:format : String - ids:dataAddress : String - ids:callbackAddress : String + dspace:dataAddress : String + dspace:callbackAddress : String } @enduml \ No newline at end of file diff --git a/transfer/message/diagram/transfer-start-message.png b/transfer/message/diagram/transfer-start-message.png index f8be5cd9..26a96aa4 100644 Binary files a/transfer/message/diagram/transfer-start-message.png and b/transfer/message/diagram/transfer-start-message.png differ diff --git a/transfer/message/diagram/transfer-start-message.puml b/transfer/message/diagram/transfer-start-message.puml index fbbf2e2c..54e75ba6 100644 --- a/transfer/message/diagram/transfer-start-message.puml +++ b/transfer/message/diagram/transfer-start-message.puml @@ -6,12 +6,12 @@ hide empty description -class "ids:TransferStartMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:TransferStartMessage" - ids:processId : String - ids:correlationId : String - ids:dataAddress : String +class "dspace:TransferStartMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:TransferStartMessage" + dspace:processId : String + dspace:correlationId : String + dspace:dataAddress : String } @enduml \ No newline at end of file diff --git a/transfer/message/diagram/transfer-suspension-message.png b/transfer/message/diagram/transfer-suspension-message.png index 19326b64..1d844d50 100644 Binary files a/transfer/message/diagram/transfer-suspension-message.png and b/transfer/message/diagram/transfer-suspension-message.png differ diff --git a/transfer/message/diagram/transfer-suspension-message.puml b/transfer/message/diagram/transfer-suspension-message.puml index 8285938d..18f7a445 100644 --- a/transfer/message/diagram/transfer-suspension-message.puml +++ b/transfer/message/diagram/transfer-suspension-message.puml @@ -6,13 +6,13 @@ hide empty description -class "ids:TransferSuspensionMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:TransferSuspensionMessage" - ids:processId : String - ids:correlationId : String - ids:code : String - ids:reason : Array +class "dspace:TransferSuspensionMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:TransferSuspensionMessage" + dspace:processId : String + dspace:correlationId : String + dspace:code : String + dspace:reason : Array } @enduml \ No newline at end of file diff --git a/transfer/message/diagram/transfer-termination-message.png b/transfer/message/diagram/transfer-termination-message.png index 2d819eea..b6eff1a4 100644 Binary files a/transfer/message/diagram/transfer-termination-message.png and b/transfer/message/diagram/transfer-termination-message.png differ diff --git a/transfer/message/diagram/transfer-termination-message.puml b/transfer/message/diagram/transfer-termination-message.puml index 89ab651d..a01064c4 100644 --- a/transfer/message/diagram/transfer-termination-message.puml +++ b/transfer/message/diagram/transfer-termination-message.puml @@ -6,13 +6,13 @@ hide empty description -class "ids:TransferTerminationMessage" { - @context : "https://w3id.org/idsa/v5/context.json" - @type : "ids:TransferTerminationMessage" - ids:processId : String - ids:correlationId : String - ids:code : String - ids:reason : Array +class "dspace:TransferTerminationMessage" { + @context : "https://w3id.org/dspace/1/0/context.json" + @type : "dspace:TransferTerminationMessage" + dspace:processId : String + dspace:correlationId : String + dspace:code : String + dspace:reason : Array } @enduml \ No newline at end of file diff --git a/transfer/message/schema/transfer-completion-message-schema.json b/transfer/message/schema/transfer-completion-message-schema.json index db7bf7ad..30e79864 100644 --- a/transfer/message/schema/transfer-completion-message-schema.json +++ b/transfer/message/schema/transfer-completion-message-schema.json @@ -7,26 +7,26 @@ "$ref": "#/definitions/TransferCompletionMessage" } ], - "$id": "https://w3id.org/idsa/core/v5/TransferCompletionMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/TransferCompletionMessageSchema", "definitions": { "TransferCompletionMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:TransferCompletionMessage", + "const": "dspace:TransferCompletionMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:correlationId": { + "dspace:correlationId": { "type": "string", "required": true } diff --git a/transfer/message/schema/transfer-error-schema.json b/transfer/message/schema/transfer-error-schema.json index e4c3d7f2..b63d82a3 100644 --- a/transfer/message/schema/transfer-error-schema.json +++ b/transfer/message/schema/transfer-error-schema.json @@ -7,34 +7,34 @@ "$ref": "#/definitions/TransferError" } ], - "$id": "https://w3id.org/idsa/core/v5/TransferErrorSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/TransferErrorSchema", "definitions": { "TransferError": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:TransferError", + "const": "dspace:TransferError", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:correlationId": { + "dspace:correlationId": { "type": "string", "required": true }, - "ids:code": { + "dspace:code": { "type": "string", "required": true }, - "ids:reason": { + "dspace:reason": { "type": "array", "required": false, "minItems": 1, diff --git a/transfer/message/schema/transfer-process-schema.json b/transfer/message/schema/transfer-process-schema.json index ece3aa68..c0149f3b 100644 --- a/transfer/message/schema/transfer-process-schema.json +++ b/transfer/message/schema/transfer-process-schema.json @@ -7,36 +7,36 @@ "$ref": "#/definitions/TransferProcess" } ], - "$id": "https://w3id.org/idsa/core/v5/TransferProcessSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/TransferProcessSchema", "definitions": { "TransferProcess": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:TransferProcess", + "const": "dspace:TransferProcess", "required": true }, - "ids:correlationId": { + "dspace:correlationId": { "type": "string", "required": true }, - "ids:transferState": { + "dspace:transferState": { "type": "object", "properties": { "@id": { "type": "string", "enum": [ - "ids:REQUESTED", - "ids:STARTED", - "ids:TERMINATED", - "ids:COMPLETED", - "ids:SUSPENDED" + "dspace:REQUESTED", + "dspace:STARTED", + "dspace:TERMINATED", + "dspace:COMPLETED", + "dspace:SUSPENDED" ] }, "required": true diff --git a/transfer/message/schema/transfer-request-message-schema.json b/transfer/message/schema/transfer-request-message-schema.json index d7649dc0..cbb659de 100644 --- a/transfer/message/schema/transfer-request-message-schema.json +++ b/transfer/message/schema/transfer-request-message-schema.json @@ -7,22 +7,22 @@ "$ref": "#/definitions/TransferRequestMessage" } ], - "$id": "https://w3id.org/idsa/core/v5/TransferRequestMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/TransferRequestMessageSchema", "definitions": { "TransferRequestMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:TransferRequestMessage", + "const": "dspace:TransferRequestMessage", "required": true }, - "ids:agreementId": { + "dspace:agreementId": { "type": "object", "properties": { "@value": { @@ -41,7 +41,7 @@ "type": "string", "required": true }, - "ids:dataAddress": { + "dspace:dataAddress": { "type": "object", "properties": { "@value": { @@ -56,7 +56,7 @@ }, "required": false }, - "ids:callbackAddress": { + "dspace:callbackAddress": { "type": "object", "properties": { "@value": { diff --git a/transfer/message/schema/transfer-start-message-schema.json b/transfer/message/schema/transfer-start-message-schema.json index d700d7b9..7c7b12ca 100644 --- a/transfer/message/schema/transfer-start-message-schema.json +++ b/transfer/message/schema/transfer-start-message-schema.json @@ -7,30 +7,30 @@ "$ref": "#/definitions/TransferStartMessage" } ], - "$id": "https://w3id.org/idsa/core/v5/TransferStartMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/TransferStartMessageSchema", "definitions": { "TransferStartMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:TransferStartMessage", + "const": "dspace:TransferStartMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:correlationId": { + "dspace:correlationId": { "type": "string", "required": true }, - "ids:dataAddress": { + "dspace:dataAddress": { "type": "object", "properties": { "@value": { diff --git a/transfer/message/schema/transfer-suspension-message-schema.json b/transfer/message/schema/transfer-suspension-message-schema.json index d54567ca..745938e9 100644 --- a/transfer/message/schema/transfer-suspension-message-schema.json +++ b/transfer/message/schema/transfer-suspension-message-schema.json @@ -7,30 +7,30 @@ "$ref": "#/definitions/TransferSuspensionMessage" } ], - "$id": "https://w3id.org/idsa/core/v5/TransferSuspensionMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/TransferSuspensionMessageSchema", "definitions": { "TransferSuspensionMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:TransferSuspensionMessage", + "const": "dspace:TransferSuspensionMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:correlationId": { + "dspace:correlationId": { "type": "string", "required": true }, - "ids:reason": { + "dspace:reason": { "type": "array", "required": false, "minItems": 1, diff --git a/transfer/message/schema/transfer-termination-message-schema.json b/transfer/message/schema/transfer-termination-message-schema.json index df29e602..885a323c 100644 --- a/transfer/message/schema/transfer-termination-message-schema.json +++ b/transfer/message/schema/transfer-termination-message-schema.json @@ -7,34 +7,34 @@ "$ref": "#/definitions/TransferTerminationMessage" } ], - "$id": "https://w3id.org/idsa/core/v5/TransferTerminationMessageSchema", + "$id": "https://w3id.org/dspace/schemas/1/0/TransferTerminationMessageSchema", "definitions": { "TransferTerminationMessage": { "type": "object", "properties": { "@context": { "type": "string", - "const": "https://w3id.org/idsa/v5/context.json", + "const": "https://w3id.org/dspace/1/0/context.json", "required": true }, "@type": { "type": "string", - "const": "ids:TransferTerminationMessage", + "const": "dspace:TransferTerminationMessage", "required": true }, - "ids:processId": { + "dspace:processId": { "type": "string", "required": true }, - "ids:correlationId": { + "dspace:correlationId": { "type": "string", "required": true }, - "ids:code": { + "dspace:code": { "type": "string", "required": true }, - "ids:reason": { + "dspace:reason": { "type": "array", "required": false, "minItems": 1, diff --git a/transfer/message/shape/transfer-completion-message-shape.ttl b/transfer/message/shape/transfer-completion-message-shape.ttl index a06ec081..2065d8b7 100644 --- a/transfer/message/shape/transfer-completion-message-shape.ttl +++ b/transfer/message/shape/transfer-completion-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,23 +20,23 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:TransferCompletionMessageShape a sh:NodeShape ; - sh:targetClass ids:TransferCompletionMessage ; + sh:targetClass dspace:TransferCompletionMessage ; sh:property [ a sh:PropertyShape ; - sh:path ids:correlationId ; + sh:path dspace:correlationId ; sh:datatype xsd:string ; sh:severity sh:Violation ; sh:maxCount 1 ; sh:minCount 1 ; - sh:message " (TransferCompletionMessageShape): An ids:correlationId property must point exactly one xsd:string field."@en ; + sh:message " (TransferCompletionMessageShape): An dspace:correlationId property must point exactly one xsd:string field."@en ; ] ; . \ No newline at end of file diff --git a/transfer/message/shape/transfer-error-shape.ttl b/transfer/message/shape/transfer-error-shape.ttl index e68c5122..3fcdcdbe 100644 --- a/transfer/message/shape/transfer-error-shape.ttl +++ b/transfer/message/shape/transfer-error-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,34 +20,34 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:TransferErrorShape a sh:NodeShape ; - sh:targetClass ids:TransferError ; - rdfs:subClassOf ids:MessageShape ; + sh:targetClass dspace:TransferError ; + rdfs:subClassOf dspace:MessageShape ; sh:property [ a sh:PropertyShape ; - sh:path ids:correlationId ; + sh:path dspace:correlationId ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (TransferErrorShape): An ids:correlationId property must point from an ids:TransferError to exactly one xsd:string field."@en ; + sh:message " (TransferErrorShape): An dspace:correlationId property must point from an dspace:TransferError to exactly one xsd:string field."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:code ; + sh:path dspace:code ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (TransferErrorShape): An ids:code property must point from an ids:TransferError to exactly one ids:TerminationCode."@en ; + sh:message " (TransferErrorShape): An dspace:code property must point from an dspace:TransferError to exactly one dspace:TerminationCode."@en ; ] ; . \ No newline at end of file diff --git a/transfer/message/shape/transfer-process-shape.ttl b/transfer/message/shape/transfer-process-shape.ttl index 09c920dd..f7872f04 100644 --- a/transfer/message/shape/transfer-process-shape.ttl +++ b/transfer/message/shape/transfer-process-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,33 +20,33 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:TransferProcessShape a sh:NodeShape ; - sh:targetClass ids:TransferProcess ; + sh:targetClass dspace:TransferProcess ; sh:property [ a sh:PropertyShape ; - sh:path ids:correlationId ; + sh:path dspace:correlationId ; sh:datatype xsd:string ; sh:severity sh:Violation ; sh:maxCount 1 ; sh:minCount 1 ; - sh:message " (TransferProcessShape): An ids:correlationId property must point exactly one xsd:string field."@en ; + sh:message " (TransferProcessShape): An dspace:correlationId property must point exactly one xsd:string field."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:transferState ; - sh:class ids:TransferState ; + sh:path dspace:transferState ; + sh:class dspace:TransferState ; sh:severity sh:Violation ; sh:maxCount 1 ; sh:minCount 1 ; - sh:message " (TransferProcessShape): An ids:state property must point exactly one ids:TransferState entity."@en ; + sh:message " (TransferProcessShape): An dspace:state property must point exactly one dspace:TransferState entity."@en ; ] ; . \ No newline at end of file diff --git a/transfer/message/shape/transfer-request-message-shape.ttl b/transfer/message/shape/transfer-request-message-shape.ttl index fbc5b90b..b70b659a 100644 --- a/transfer/message/shape/transfer-request-message-shape.ttl +++ b/transfer/message/shape/transfer-request-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,23 +20,23 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:TransferRequestMessageShape a sh:NodeShape ; - sh:targetClass ids:TransferRequestMessage ; + sh:targetClass dspace:TransferRequestMessage ; sh:property [ a sh:PropertyShape ; - sh:path ids:agreementId ; + sh:path dspace:agreementId ; sh:datatype xsd:anyURI ; sh:severity sh:Violation ; sh:maxCount 1 ; sh:minCount 1 ; - sh:message " (TransferRequestMessageShape): An ids:agreementId property must point exactly one xsd:anyURI field."@en ; + sh:message " (TransferRequestMessageShape): An dspace:agreementId property must point exactly one xsd:anyURI field."@en ; ] ; sh:property [ @@ -51,21 +51,21 @@ shapes:TransferRequestMessageShape sh:property [ a sh:PropertyShape ; - sh:path ids:dataAddress ; + sh:path dspace:dataAddress ; sh:datatype xsd:anyURI ; sh:severity sh:Violation ; sh:maxCount 1 ; sh:minCount 0 ; - sh:message " (TransferRequestMessageShape): An ids:dataAddress property must point zero or one xsd:anyURI field."@en ; + sh:message " (TransferRequestMessageShape): An dspace:dataAddress property must point zero or one xsd:anyURI field."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:callbackAddress ; + sh:path dspace:callbackAddress ; sh:datatype xsd:anyURI ; sh:severity sh:Violation ; sh:maxCount 1 ; sh:minCount 1 ; - sh:message " (TransferRequestMessageShape): An ids:callbackAddress property must point exactly one xsd:anyURI field."@en ; + sh:message " (TransferRequestMessageShape): An dspace:callbackAddress property must point exactly one xsd:anyURI field."@en ; ] ; . \ No newline at end of file diff --git a/transfer/message/shape/transfer-start-message-shape.ttl b/transfer/message/shape/transfer-start-message-shape.ttl index 7d01d7d0..a5c6ee81 100644 --- a/transfer/message/shape/transfer-start-message-shape.ttl +++ b/transfer/message/shape/transfer-start-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,34 +20,34 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:TransferStartMessageShape a sh:NodeShape ; - sh:targetClass ids:TransferStartMessage ; - rdfs:subClassOf ids:MessageShape ; + sh:targetClass dspace:TransferStartMessage ; + rdfs:subClassOf dspace:MessageShape ; sh:property [ a sh:PropertyShape ; - sh:path ids:correlationId ; + sh:path dspace:correlationId ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (TransferStartMessageShape): An ids:correlationId property must point from an ids:TransferStartMessage to exactly one xsd:string field."@en ; + sh:message " (TransferStartMessageShape): An dspace:correlationId property must point from an dspace:TransferStartMessage to exactly one xsd:string field."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:dataAddress ; + sh:path dspace:dataAddress ; sh:datatype xsd:anyURI ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (TransferStartMessageShape): An ids:dataAddress property must point from an ids:TransferStartMessage to exactly one xsd:anyURI field."@en ; + sh:message " (TransferStartMessageShape): An dspace:dataAddress property must point from an dspace:TransferStartMessage to exactly one xsd:anyURI field."@en ; ] ; . \ No newline at end of file diff --git a/transfer/message/shape/transfer-suspension-message-shape.ttl b/transfer/message/shape/transfer-suspension-message-shape.ttl index 17b6c96b..a73c0d2c 100644 --- a/transfer/message/shape/transfer-suspension-message-shape.ttl +++ b/transfer/message/shape/transfer-suspension-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,24 +20,24 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:TransferSuspensionMessageShape a sh:NodeShape ; - sh:targetClass ids:TransferSuspensionMessage ; - rdfs:subClassOf ids:MessageShape ; + sh:targetClass dspace:TransferSuspensionMessage ; + rdfs:subClassOf dspace:MessageShape ; sh:property [ a sh:PropertyShape ; - sh:path ids:correlationId ; + sh:path dspace:correlationId ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (TransferSuspensionMessageShape): An ids:correlationId property must point from an ids:TransferSuspensionMessage to exactly one xsd:string field."@en ; + sh:message " (TransferSuspensionMessageShape): An dspace:correlationId property must point from an dspace:TransferSuspensionMessage to exactly one xsd:string field."@en ; ] ; . \ No newline at end of file diff --git a/transfer/message/shape/transfer-termination-message-shape.ttl b/transfer/message/shape/transfer-termination-message-shape.ttl index 636f0f10..1c5a9c38 100644 --- a/transfer/message/shape/transfer-termination-message-shape.ttl +++ b/transfer/message/shape/transfer-termination-message-shape.ttl @@ -8,8 +8,8 @@ @prefix cred: . @prefix sec: . -@prefix ids: . -@prefix ids_shapes: . +@prefix dspace: . +@prefix dspace_shapes: . @prefix sh: . @@ -20,34 +20,34 @@ shapes: sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; ] ; sh:declare [ - sh:prefix "ids" ; - sh:namespace "https://w3id.org/idsa/v5/"^^xsd:anyURI ; + sh:prefix "dspace" ; + sh:namespace "https://w3id.org/dspace/1/0/"^^xsd:anyURI ; ] ; . shapes:TransferTerminationMessageShape a sh:NodeShape ; - sh:targetClass ids:TransferTerminationMessage ; - rdfs:subClassOf ids:MessageShape ; + sh:targetClass dspace:TransferTerminationMessage ; + rdfs:subClassOf dspace:MessageShape ; sh:property [ a sh:PropertyShape ; - sh:path ids:correlationId ; + sh:path dspace:correlationId ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (TransferTerminationMessageShape): An ids:correlationId property must point from an ids:TransferTerminationMessage to exactly one xsd:string field."@en ; + sh:message " (TransferTerminationMessageShape): An dspace:correlationId property must point from an dspace:TransferTerminationMessage to exactly one xsd:string field."@en ; ] ; sh:property [ a sh:PropertyShape ; - sh:path ids:code ; + sh:path dspace:code ; sh:datatype xsd:string ; sh:maxCount 1 ; sh:minCount 1 ; sh:severity sh:Violation ; - sh:message " (TransferTerminationMessageShape): An ids:code property must point from an ids:TransferTerminationMessage to exactly one entity."@en ; + sh:message " (TransferTerminationMessageShape): An dspace:code property must point from an dspace:TransferTerminationMessage to exactly one entity."@en ; ] ; . \ No newline at end of file diff --git a/transfer/message/transfer-completion-message.json b/transfer/message/transfer-completion-message.json index 8249b839..15c746cd 100644 --- a/transfer/message/transfer-completion-message.json +++ b/transfer/message/transfer-completion-message.json @@ -1,7 +1,7 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:6b9dd9cc-f60c-4253-b031-86755cf25720", - "@type": "ids:TransferCompletionMessage", - "ids:processId": "urn:uuid:24a62493-06eb-45e4-a41c-6de091b51da5", - "ids:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f" + "@type": "dspace:TransferCompletionMessage", + "dspace:processId": "urn:uuid:24a62493-06eb-45e4-a41c-6de091b51da5", + "dspace:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f" } diff --git a/transfer/message/transfer-error.json b/transfer/message/transfer-error.json index 166d9cef..88eda3a8 100644 --- a/transfer/message/transfer-error.json +++ b/transfer/message/transfer-error.json @@ -1,10 +1,10 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", - "@type": "ids:TransferError", - "ids:processId": "urn:uuid:71f8dfab-9337-4e9d-a4c7-524e04443f16", - "ids:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "ids:code": "...", - "ids:reason": [ + "@context": "https://w3id.org/dspace/1/0/context.json", + "@type": "dspace:TransferError", + "dspace:processId": "urn:uuid:71f8dfab-9337-4e9d-a4c7-524e04443f16", + "dspace:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", + "dspace:code": "...", + "dspace:reason": [ {}, {} ] diff --git a/transfer/message/transfer-process.json b/transfer/message/transfer-process.json index f6ea4799..d7d9121b 100644 --- a/transfer/message/transfer-process.json +++ b/transfer/message/transfer-process.json @@ -1,7 +1,7 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:71f8dfab-9337-4e9d-a4c7-524e04443f16", - "@type": "ids:TransferProcess", - "ids:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "ids:state": "REQUESTED" + "@type": "dspace:TransferProcess", + "dspace:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", + "dspace:state": "REQUESTED" } diff --git a/transfer/message/transfer-request-message.json b/transfer/message/transfer-request-message.json index 77515d54..daddfb67 100644 --- a/transfer/message/transfer-request-message.json +++ b/transfer/message/transfer-request-message.json @@ -1,9 +1,9 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "@type": "ids:TransferRequestMessage", - "ids:agreementId": "urn:uuid:e8dc8655-44c2-46ef-b701-4cffdc2faa44", - "dct:format": "ids:S3_AWS_PUSH", - "ids:dataAddress": {}, - "ids:callbackAddress": "https://......" + "@type": "dspace:TransferRequestMessage", + "dspace:agreementId": "urn:uuid:e8dc8655-44c2-46ef-b701-4cffdc2faa44", + "dct:format": "dspace:S3_AWS_PUSH", + "dspace:dataAddress": {}, + "dspace:callbackAddress": "https://......" } diff --git a/transfer/message/transfer-start-message.json b/transfer/message/transfer-start-message.json index c83da6c9..58790ecf 100644 --- a/transfer/message/transfer-start-message.json +++ b/transfer/message/transfer-start-message.json @@ -1,8 +1,8 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:6b9dd9cc-f60c-4253-b031-86755cf25720", - "@type": "ids:TransferStartMessage", - "ids:processId": "urn:uuid:24a62493-06eb-45e4-a41c-6de091b51da5", - "ids:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "ids:dataAddress": {} + "@type": "dspace:TransferStartMessage", + "dspace:processId": "urn:uuid:24a62493-06eb-45e4-a41c-6de091b51da5", + "dspace:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", + "dspace:dataAddress": {} } diff --git a/transfer/message/transfer-suspension-message.json b/transfer/message/transfer-suspension-message.json index bf271684..ca603b8c 100644 --- a/transfer/message/transfer-suspension-message.json +++ b/transfer/message/transfer-suspension-message.json @@ -1,11 +1,11 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:6b9dd9cc-f60c-4253-b031-86755cf25720", - "@type": "ids:TransferSuspensionMessage", - "ids:processId": "urn:uuid:24a62493-06eb-45e4-a41c-6de091b51da5", - "ids:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "ids:code": "...", - "ids:reason": [ + "@type": "dspace:TransferSuspensionMessage", + "dspace:processId": "urn:uuid:24a62493-06eb-45e4-a41c-6de091b51da5", + "dspace:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", + "dspace:code": "...", + "dspace:reason": [ {}, {} ] diff --git a/transfer/message/transfer-termination-message.json b/transfer/message/transfer-termination-message.json index f958cc5f..0bca4c8e 100644 --- a/transfer/message/transfer-termination-message.json +++ b/transfer/message/transfer-termination-message.json @@ -1,11 +1,11 @@ { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:6b9dd9cc-f60c-4253-b031-86755cf25720", - "@type": "ids:TransferTerminationMessage", - "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", - "ids:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "ids:code": "...", - "ids:reason": [ + "@type": "dspace:TransferTerminationMessage", + "dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", + "dspace:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", + "dspace:code": "...", + "dspace:reason": [ {}, {} ] diff --git a/transfer/transfer.process.binding.https.md b/transfer/transfer.process.binding.https.md index 519cc889..6df89260 100644 --- a/transfer/transfer.process.binding.https.md +++ b/transfer/transfer.process.binding.https.md @@ -53,11 +53,11 @@ the [TransferProcess](./message/transfer.process.json): ``` { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:71f8dfab-9337-4e9d-a4c7-524e04443f16", - "@type": "ids:TransferProcess", - "ids:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "ids:state": "REQUESTED" + "@type": "dspace:TransferProcess", + "dspace:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", + "dspace:state": "REQUESTED" } ``` @@ -78,13 +78,13 @@ to `transfer-processes/request`: Authorization: ... { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "@type": "ids:TransferRequestMessage", - "ids:agreementId": "urn:uuid:e8dc8655-44c2-46ef-b701-4cffdc2faa44", - "dct:format": "ids:s3+push", + "@type": "dspace:TransferRequestMessage", + "dspace:agreementId": "urn:uuid:e8dc8655-44c2-46ef-b701-4cffdc2faa44", + "dct:format": "dspace:s3+push", "dataAddress": {}, - "ids:callbackAddress": "https://......" + "dspace:callbackAddress": "https://......" } ``` @@ -103,11 +103,11 @@ the [TransferProcess](./message/transfer.process.json) message: Location: /transfer-processes/urn:uuid:71f8dfab-9337-4e9d-a4c7-524e04443f16 { - "@context": "https://w3id.org/idsa/v5/context.json", + "@context": "https://w3id.org/dspace/1/0/context.json", "@id": "urn:uuid:71f8dfab-9337-4e9d-a4c7-524e04443f16", - "@type": "ids:TransferProcess", - "ids:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", - "ids:state": "REQUESTED" + "@type": "dspace:TransferProcess", + "dspace:correlationId": "urn:uuid:4a3ad65e-d78a-4200-a666-fc47aec32f2f", + "dspace:state": "REQUESTED" } ```