Skip to content

Commit

Permalink
changing the "ids" namespace to "dspace" in all documents, figures, s…
Browse files Browse the repository at this point in the history
…chemas etc. (#49)
  • Loading branch information
sebbader-sap authored Mar 2, 2023
1 parent 7c2cf42 commit a98e3d4
Show file tree
Hide file tree
Showing 105 changed files with 616 additions and 616 deletions.
14 changes: 7 additions & 7 deletions catalog/catalog.binding.https.md
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
```

Expand Down Expand Up @@ -93,7 +93,7 @@ and the HTTP `Link` header. The `Link` header will contain URLs for navigating t
```
Link: <https://provider.com/catalog?page=2&per_page=100>; rel="next"
{
"@context": "https://w3id.org/idsa/v5/context.json",
"@context": "https://w3id.org/dspace/1/0/context.json",
"@type": "dcat:Catalog"
...
}
Expand Down Expand Up @@ -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"
}
```

Expand Down
6 changes: 3 additions & 3 deletions catalog/catalog.protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
|------------|----------------------------------------------------------------------------|
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions catalog/message/catalog-error-message.json
Original file line number Diff line number Diff line change
@@ -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"}
]
Expand Down
6 changes: 3 additions & 3 deletions catalog/message/catalog-request-message.json
Original file line number Diff line number Diff line change
@@ -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": {}
}
6 changes: 3 additions & 3 deletions catalog/message/catalog.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
}
],
Expand Down Expand Up @@ -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"
}
]
Expand Down
6 changes: 3 additions & 3 deletions catalog/message/dataset-request-message.json
Original file line number Diff line number Diff line change
@@ -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"
}
Binary file modified catalog/message/diagram/catalog-error-message.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions catalog/message/diagram/catalog-error-message.puml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified catalog/message/diagram/catalog-request-message.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions catalog/message/diagram/catalog-request-message.puml
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions catalog/message/example/dcat.distribution.example.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
28 changes: 14 additions & 14 deletions catalog/message/example/dcat.distribution.example.option1.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -14,7 +14,7 @@
}
],
"dcat:keyword": [
"IDS",
"data space",
"data asset",
"dcat dataset",
"collection"
Expand All @@ -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",
Expand All @@ -45,7 +45,7 @@
{
"@type": [
"dcat:DataService",
"ids:TRANSFER_SERVICE"
"dspace:TRANSFER_SERVICE"
],
"dcat:endpointURL": {
"@type": "xsd:anyURI",
Expand All @@ -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",
Expand All @@ -79,7 +79,7 @@
{
"@type": [
"dcat:DataService",
"ids:TRANSFER_SERVICE"
"dspace:TRANSFER_SERVICE"
],
"dcat:endpointURL": {
"@type": "xsd:anyURI",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
28 changes: 14 additions & 14 deletions catalog/message/example/dcat.distribution.example.option2.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
Expand All @@ -24,8 +24,8 @@
"HTTP",
"REST"
],
"ids:transportType": {
"@id": "ids:HTTP_REST"
"dspace:transportType": {
"@id": "dspace:HTTP_REST"
},
"odrl:hasPolicy": {
"@type": "odrl:Offer",
Expand All @@ -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",
Expand All @@ -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"
Expand All @@ -81,8 +81,8 @@
"S3",
"public"
],
"ids:transportType": {
"@id": "ids:S3"
"dspace:transportType": {
"@id": "dspace:S3"
},
"odrl:hasPolicy": {
"@type": "odrl:Offer",
Expand All @@ -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",
Expand All @@ -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"
Expand Down
Loading

0 comments on commit a98e3d4

Please sign in to comment.