Skip to content

Commit 4f00186

Browse files
mokhairymahmoudmokhairymahmoud
committed
refactor: migrate to DSP 2025-1
1 parent cdffb42 commit 4f00186

39 files changed

Lines changed: 70 additions & 70 deletions

File tree

‎advanced/advanced-01-open-telemetry/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ The output will be something like:
9999
"@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
100100
"@type": "dcat:DataService",
101101
"dcat:endpointDescription": "dspace:connector",
102-
"dcat:endpointUrl": "http://provider:19194/protocol",
102+
"dcat:endpointUrl": "http://provider:19194/protocol/2025-1",
103103
"dct:terms": "dspace:connector",
104-
"dct:endpointUrl": "http://provider:19194/protocol"
104+
"dct:endpointUrl": "http://provider:19194/protocol/2025-1"
105105
}
106106
},
107107
{
@@ -113,9 +113,9 @@ The output will be something like:
113113
"@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
114114
"@type": "dcat:DataService",
115115
"dcat:endpointDescription": "dspace:connector",
116-
"dcat:endpointUrl": "http://provider:19194/protocol",
116+
"dcat:endpointUrl": "http://provider:19194/protocol/2025-1",
117117
"dct:terms": "dspace:connector",
118-
"dct:endpointUrl": "http://provider:19194/protocol"
118+
"dct:endpointUrl": "http://provider:19194/protocol/2025-1"
119119
}
120120
}
121121
],
@@ -128,7 +128,7 @@ The output will be something like:
128128
"dcat": "http://www.w3.org/ns/dcat#",
129129
"dct": "http://purl.org/dc/terms/",
130130
"odrl": "http://www.w3.org/ns/odrl/2/",
131-
"dspace": "https://w3id.org/dspace/v0.8/"
131+
"dspace": "https://w3id.org/dspace/2025/1/"
132132
}
133133
}
134134

@@ -217,7 +217,7 @@ which has to be stored in the root folder of this sample as well. The only addit
217217
WEB_HTTP_MANAGEMENT_AUTH_KEY: password
218218
WEB_HTTP_PROTOCOL_PORT: 9292
219219
WEB_HTTP_PROTOCOL_PATH: /protocol
220-
EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol
220+
EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol/2025-1
221221
EDC_PARTICIPANT_ID: consumer
222222
entrypoint: java
223223
-javaagent:/resources/opentelemetry-javaagent.jar

‎advanced/advanced-01-open-telemetry/docker-compose.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
WEB_HTTP_VERSION_PORT: 29195
3333
WEB_HTTP_VERSION_PATH: /version
3434
EDC_CONTROL_ENDPOINT: http://consumer:29192/control
35-
EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol
35+
EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol/2025-1
3636
EDC_PARTICIPANT_ID: consumer
3737
EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
3838
EDC_KEYSTORE_PASSWORD: 123456
@@ -72,7 +72,7 @@ services:
7272
WEB_HTTP_VERSION_PORT: 19195
7373
WEB_HTTP_VERSION_PATH: /version
7474
EDC_CONTROL_ENDPOINT: http://provider:19192/control
75-
EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol
75+
EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol/2025-1
7676
EDC_PARTICIPANT_ID: provider
7777
EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
7878
EDC_KEYSTORE_PASSWORD: 123456

‎advanced/advanced-01-open-telemetry/resources/get-dataset.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
33
"@type": "DatasetRequest",
44
"@id": "assetId",
5-
"counterPartyAddress": "http://provider:19194/protocol",
6-
"protocol": "dataspace-protocol-http"
7-
}
5+
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
6+
"protocol": "dataspace-protocol-http:2025-1"
7+
}

‎advanced/advanced-01-open-telemetry/resources/negotiate-contract.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
44
},
55
"@type": "ContractRequest",
6-
"counterPartyAddress": "http://provider:19194/protocol",
7-
"protocol": "dataspace-protocol-http",
6+
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
7+
"protocol": "dataspace-protocol-http:2025-1",
88
"policy": {
99
"@context": "http://www.w3.org/ns/odrl.jsonld",
1010
"@id": "{{contract-offer-id}}",

‎advanced/advanced-01-open-telemetry/resources/start-transfer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
},
55
"@type": "TransferRequestDto",
66
"connectorId": "provider",
7-
"counterPartyAddress": "http://provider:19194/protocol",
7+
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
88
"contractId": "{{contract-agreement-id}}",
9-
"protocol": "dataspace-protocol-http",
9+
"protocol": "dataspace-protocol-http:2025-1",
1010
"transferType": "HttpData-PULL"
1111
}

‎federated-catalog/fc-01-embedded/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Sample output:
115115

116116
},
117117
"dspace:participantId": "provider",
118-
"originator": "http://localhost:19194/protocol",
118+
"originator": "http://localhost:19194/protocol/2025-1",
119119
"@context": {
120120
}
121121
}

‎federated-catalog/fc-01-embedded/fc-connector/config.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
edc.participant.id=fc-connector
2-
edc.dsp.callback.address=http://localhost:19194/protocol
2+
edc.dsp.callback.address=http://localhost:19194/protocol/2025-1
33
web.http.port=29191
44
web.http.path=/api
55
web.http.management.port=29193

‎federated-catalog/fc-02-standalone/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Sample output:
9898

9999
},
100100
"dspace:participantId": "provider",
101-
"originator": "http://localhost:19194/protocol",
101+
"originator": "http://localhost:19194/protocol/2025-1",
102102
"@context": {
103103

104104
}

‎federated-catalog/fc-03-static-node-directory/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ In this case, the file contains the properties of the `participant-connector` fr
3636
{
3737
"name": "https://w3id.org/edc/v0.0.1/ns/",
3838
"id": "provider",
39-
"url": "http://localhost:19194/protocol",
40-
"supportedProtocols": ["dataspace-protocol-http"]
39+
"url": "http://localhost:19194/protocol/2025-1",
40+
"supportedProtocols": ["dataspace-protocol-http:2025-1"]
4141
}
4242
```
4343
However, this solution is intended for use only within the sample scope; in production, it must be managed in different way.

‎policy/policy-01-policy-enforcement/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ We'll receive the following catalog in the response, where we can see the offer
272272
"@id": "fe9581ee-b4ec-473c-b0b7-96f30d957e87",
273273
"@type": "dcat:DataService",
274274
"dct:terms": "connector",
275-
"dct:endpointUrl": "http://localhost:8282/protocol"
275+
"dct:endpointUrl": "http://localhost:8282/protocol/2025-1"
276276
},
277277
"participantId": "provider",
278278
"@context": {
@@ -281,7 +281,7 @@ We'll receive the following catalog in the response, where we can see the offer
281281
"dcat": "https://www.w3.org/ns/dcat/",
282282
"dct": "https://purl.org/dc/terms/",
283283
"odrl": "http://www.w3.org/ns/odrl/2/",
284-
"dspace": "https://w3id.org/dspace/v0.8/"
284+
"dspace": "https://w3id.org/dspace/2025/1/"
285285
}
286286
}
287287

0 commit comments

Comments
 (0)