Skip to content

Commit 463d386

Browse files
wolf4oodwolf4ood
committed
chore: update payload
1 parent da75a2c commit 463d386

11 files changed

Lines changed: 201 additions & 219 deletions

File tree

‎content/en/documentation/for-adopters/control-plane/_index.md‎

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ An `Asset` is the primary building block for data sharing. An asset represents a
150150

151151
```json
152152
{
153-
"@context": {
154-
"edc": "https://w3id.org/edc/v0.0.1/ns/"
155-
},
153+
"@context": [
154+
"https://w3id.org/edc/connector/management/v2"
155+
],
156156
"@id": "899d1ad0-532a-47e8-2245-1aa3b2a4eac6",
157157
"properties": {
158158
"somePublicProp": "a very interesting value"
@@ -183,10 +183,12 @@ The `@context` property on an asset indicates that it is a JSON-LD type. JSON-LD
183183

184184
```json
185185
{
186-
"@context": {
187-
"edc": "https://w3id.org/edc/v0.0.1/ns/",
188-
"market-systems": "http://w3id.org/market-systems/v0.0.1/ns/"
189-
},
186+
"@context": [
187+
"https://w3id.org/edc/connector/management/v2",
188+
{
189+
"market-systems": "http://w3id.org/market-systems/v0.0.1/ns/"
190+
}
191+
],
190192
"@id": "...",
191193
"properties": {
192194
"dataFeed": {
@@ -243,9 +245,9 @@ Policies are loaded into EDC via the Management API using a policy definition, w
243245

244246
```json
245247
{
246-
"@context": {
247-
"edc": "https://w3id.org/edc/v0.0.1/ns/"
248-
},
248+
"@context": [
249+
"https://w3id.org/edc/connector/management/v2"
250+
],
249251
"@type": "PolicyDefinition",
250252
"policy": {
251253
"@context": "http://www.w3.org/ns/odrl.jsonld",
@@ -279,25 +281,25 @@ Now, let's examine a contract definition:
279281

280282
```json
281283
{
282-
"@context": {
283-
"edc": "https://w3id.org/edc/v0.0.1/ns/"
284-
},
285-
"@type": "https://w3id.org/edc/v0.0.1/ns/ContractDefinition",
284+
"@context": [
285+
"https://w3id.org/edc/connector/management/v2"
286+
],
287+
"@type": "ContractDefinition",
286288
"@id": "test-id",
287-
"edc:accessPolicyId": "access-policy-1234",
288-
"edc:contractPolicyId": "contract-policy-5678",
289-
"edc:assetsSelector": [
289+
"accessPolicyId": "access-policy-1234",
290+
"contractPolicyId": "contract-policy-5678",
291+
"assetsSelector": [
290292
{
291-
"@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
292-
"edc:operandLeft": "id",
293-
"edc:operator": "in",
294-
"edc:operandRight": ["id1", "id2", "id3"]
293+
"@type": "Criterion",
294+
"operandLeft": "id",
295+
"operator": "in",
296+
"operandRight": ["id1", "id2", "id3"]
295297
},
296298
{
297-
"@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
298-
"edc:operandLeft": "productCategory",
299-
"edc:operator": "=",
300-
"edc:operandRight": "gold"
299+
"@type": "Criterion",
300+
"operandLeft": "productCategory",
301+
"operator": "=",
302+
"operandRight": "gold"
301303
},
302304
]
303305
}
@@ -329,25 +331,27 @@ If a negotiation is successfully completed (termed *finalized*), a DSP contract
329331

330332
```json
331333
{
332-
"@context": "https://w3id.org/dspace/2024/1/context.json",
333-
"@type": "dspace:ContractAgreementMessage",
334-
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
335-
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
336-
"dspace:agreement": {
334+
"@context": [
335+
"https://w3id.org/dspace/2024/1/context.json"
336+
],
337+
"@type": "ContractAgreementMessage",
338+
"providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
339+
"consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
340+
"agreement": {
337341
"@id": "urn:uuid:e8dc8655-44c2-46ef-b701-4cffdc2faa44",
338-
"@type": "odrl:Agreement",
339-
"odrl:target": "urn:uuid:3dd1add4-4d2d-569e-d634-8394a8836d23",
340-
"dspace:timestamp": "2023-01-01T01:00:00Z",
341-
"odrl:permission": [{
342-
"odrl:action": "odrl:use" ,
343-
"odrl:constraint": [{
344-
"odrl:leftOperand": "odrl:dateTime",
345-
"odrl:operand": "odrl:lteq",
346-
"odrl:rightOperand": { "@value": "2023-12-31T06:00Z", "@type": "xsd:dateTime" }
342+
"@type": "Agreement",
343+
"target": "urn:uuid:3dd1add4-4d2d-569e-d634-8394a8836d23",
344+
"timestamp": "2023-01-01T01:00:00Z",
345+
"permission": [{
346+
"action": "odrl:use" ,
347+
"constraint": [{
348+
"leftOperand": "dateTime",
349+
"operand": "lteq",
350+
"rightOperand": "2023-12-31T06:00Z"
347351
}]
348352
}]
349353
},
350-
"dspace:callbackAddress": "https://example.com/callback"
354+
"callbackAddress": "https://example.com/callback"
351355
}
352356
```
353357

‎content/en/documentation/for-adopters/control-plane/policy-engine/_index.md‎

Lines changed: 23 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Let's take one of the previous policy examples:
2525

2626
```json
2727
{
28-
"@context": {
29-
"edc": "https://w3id.org/edc/v0.0.1/ns/"
30-
},
28+
"@context": [
29+
"https://w3id.org/edc/connector/management/v2"
30+
],
3131
"@type": "PolicyDefinition",
3232
"policy": {
3333
"@context": "http://www.w3.org/ns/odrl.jsonld",
@@ -177,14 +177,13 @@ The following values are supported for the time unit:
177177
| d | days |
178178

179179
A duration is defined in a `ContractDefinition` using the following policy and left-hand
180-
operands `https://w3id.org/edc/v0.0.1/ns/inForceDate`:
180+
operands `inForceDate`:
181181

182182
```json
183183
{
184-
"@context": {
185-
"cx": "https://w3id.org/cx/v0.8/",
186-
"@vocab": "http://www.w3.org/ns/odrl.jsonld"
187-
},
184+
"@context": [
185+
"https://w3id.org/edc/connector/management/v2"
186+
],
188187
"@type": "Offer",
189188
"@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
190189
"permission": [
@@ -193,20 +192,14 @@ operands `https://w3id.org/edc/v0.0.1/ns/inForceDate`:
193192
"constraint": {
194193
"and": [
195194
{
196-
"leftOperand": "https://w3id.org/edc/v0.0.1/ns/inForceDate",
195+
"leftOperand": "inForceDate",
197196
"operator": "gt",
198-
"rightOperand": {
199-
"@value": "contractAgreement",
200-
"@type": "https://w3id.org/edc/v0.0.1/ns/inForceDate:dateExpression"
201-
}
197+
"rightOperand": "contractAgreement"
202198
},
203199
{
204-
"leftOperand": "https://w3id.org/edc/v0.0.1/ns/inForceDate:inForceDate",
200+
"leftOperand": "inForceDate",
205201
"operator": "lt",
206-
"rightOperand": {
207-
"@value": "contractAgreement + 100d",
208-
"@type": "https://w3id.org/edc/v0.0.1/ns/inForceDate:dateExpression"
209-
}
202+
"rightOperand": "contractAgreement + 100d"
210203
}
211204
]
212205
}
@@ -217,14 +210,13 @@ operands `https://w3id.org/edc/v0.0.1/ns/inForceDate`:
217210

218211
### Fixed Date
219212

220-
Fixed dates may also be specified as follows using `https://w3id.org/edc/v0.0.1/ns/inForceDate` operands:
213+
Fixed dates may also be specified as follows using `inForceDate` operands:
221214

222215
```json
223216
{
224-
"@context": {
225-
"edc": "https://w3id.org/edc/v0.0.1/ns/inForceDate",
226-
"@vocab": "http://www.w3.org/ns/odrl.jsonld"
227-
},
217+
"@context": [
218+
"https://w3id.org/edc/connector/management/v2"
219+
],
228220
"@type": "Offer",
229221
"@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
230222
"permission": [
@@ -233,20 +225,13 @@ Fixed dates may also be specified as follows using `https://w3id.org/edc/v0.0.1/
233225
"constraint": {
234226
"and": [
235227
{
236-
"leftOperand": "https://w3id.org/edc/v0.0.1/ns/inForceDate",
228+
"leftOperand": "inForceDate",
237229
"operator": "gt",
238-
"rightOperand": {
239-
"@value": "2023-01-01T00:00:01Z",
240-
"@type": "xsd:datetime"
241-
}
242-
},
230+
"rightOperand": "2023-01-01T00:00:01Z"
243231
{
244-
"leftOperand": "https://w3id.org/edc/v0.0.1/ns/inForceDate",
232+
"leftOperand": "inForceDate",
245233
"operator": "lt",
246-
"rightOperand": {
247-
"@value": "2024-01-01T00:00:01Z",
248-
"@type": "xsd:datetime"
249-
}
234+
"rightOperand": "2024-01-01T00:00:01Z"
250235
}
251236
]
252237
}
@@ -265,17 +250,16 @@ valid until its other constraints evaluate to false.
265250

266251
### Not Before and Until
267252

268-
`Not Before` and `Until` semantics can be defined by specifying a single `https://w3id.org/edc/v0.0.1/ns/inForceDate`
253+
`Not Before` and `Until` semantics can be defined by specifying a single `inForceDate`
269254
fixed date constraint and an
270255
appropriate operand. For example, the following policy
271256
defines a contact is not in force before `January 1, 2023`:
272257

273258
```json
274259
{
275-
"@context": {
276-
"edc": "https://w3id.org/edc/v0.0.1/ns/",
277-
"@vocab": "http://www.w3.org/ns/odrl.jsonld"
278-
},
260+
"@context": [
261+
"https://w3id.org/edc/connector/management/v2"
262+
],
279263
"@type": "Offer",
280264
"@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
281265
"permission": [
@@ -298,6 +282,3 @@ defines a contact is not in force before `January 1, 2023`:
298282

299283
- In-force policy with a fixed validity: [policy.inforce.fixed.json](./policy.inforce.fixed.json)
300284
- In-force policy with a relative validity duration: [policy.inforce.duration.json](./policy.inforce.duration.json)
301-
302-
_Please note that the samples use the abbreviated prefix notation `"edc:inForceDate"` instead of the full namespace
303-
`"https://w3id.org/edc/v0.0.1/ns/inForceDate"`._

‎content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.duration.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
2-
"@context": {
3-
"edc": "https://w3id.org/edc/v0.0.1/ns/",
4-
"@vocab": "http://www.w3.org/ns/odrl.jsonld"
5-
},
2+
"@context": [
3+
"https://w3id.org/edc/connector/management/v2"
4+
],
65
"@type": "Offer",
76
"@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
87
"permission": [

‎content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.fixed.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
2-
"@context": {
3-
"edc": "https://w3id.org/edc/v0.0.1/ns/",
4-
"@vocab": "http://www.w3.org/ns/odrl.jsonld"
5-
},
2+
"@context": [
3+
"https://w3id.org/edc/connector/management/v2"
4+
],
65
"@type": "Offer",
76
"@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
87
"permission": [

‎content/en/documentation/for-adopters/distributions-deployment-operations/_index.md‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -121,23 +121,25 @@ Management domains are straightforward to configure as they mainly involve catal
121121

122122
```json
123123
{
124-
"@context": "https://w3id.org/dspace/v0.8/context.json",
124+
"@context": [
125+
"https://w3id.org/dspace/2025/1/context.jsonld"
126+
],
125127
"@id": "urn:uuid:3afeadd8-ed2d-569e-d634-8394a8836d57",
126-
"@type": "dcat:Catalog",
127-
"dct:title": "Foo Industries Provider Root Catalog",
128-
"dct:description": ["A catalog of catalogs"],
129-
"dcat:catalog": {
130-
"@type": "dcat:Catalog",
131-
"dct:description": ["Foo Industries Sub-Catalog"],
132-
"dcat:distribution": {
133-
"@type": "dcat:Distribution",
134-
"dcat:accessService": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77"
128+
"@type": "Catalog",
129+
"title": "Foo Industries Provider Root Catalog",
130+
"description": ["A catalog of catalogs"],
131+
"catalog": {
132+
"@type": "Catalog",
133+
"description": ["Foo Industries Sub-Catalog"],
134+
"distribution": {
135+
"@type": "Distribution",
136+
"accessService": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77"
135137
},
136-
"dcat:service": [
138+
"service": [
137139
{
138140
"@id": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77",
139-
"@type": "dcat:DataService",
140-
"dcat:endpointURL": "https://foo-industries.com/subcatalog"
141+
"@type": "DataService",
142+
"endpointURL": "https://foo-industries.com/subcatalog"
141143
}
142144
]
143145
}
@@ -152,9 +154,9 @@ Datasets are created from assets. The same is true for linked catalogs. Adding t
152154

153155
```json
154156
{
155-
"@context": {
156-
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
157-
},
157+
"@context": [
158+
"https://w3id.org/edc/connector/management/v2"
159+
],
158160
"@id": "subcatalog-id",
159161
"@type": "CatalogAsset",
160162
"properties": {...},
@@ -171,19 +173,19 @@ The next step in creating a sub-catalog is to decide on access control, that is,
171173

172174
```json
173175
{
174-
"@context": {
175-
"edc": "https://w3id.org/edc/v0.0.1/ns/"
176-
},
177-
"@type": "https://w3id.org/edc/v0.0.1/ns/ContractDefinition",
176+
"@context": [
177+
"https://w3id.org/edc/connector/management/v2"
178+
],
179+
"@type": "ContractDefinition",
178180
"@id": "test-id",
179-
"edc:accessPolicyId": "access-policy-1234",
180-
"edc:contractPolicyId": "contract-policy-5678",
181-
"edc:assetsSelector": [
181+
"accessPolicyId": "access-policy-1234",
182+
"contractPolicyId": "contract-policy-5678",
183+
"assetsSelector": [
182184
{
183-
"@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
184-
"edc:operandLeft": "id",
185-
"edc:operator": "in",
186-
"edc:operandRight": ["subcatalog-id"]
185+
"@type": "Criterion",
186+
"operandLeft": "id",
187+
"operator": "in",
188+
"operandRight": ["subcatalog-id"]
187189
}
188190
]
189191
}
@@ -193,19 +195,19 @@ Alternatively, the following contract definition example selects a group of sub-
193195

194196
```json
195197
{
196-
"@context": {
197-
"edc": "https://w3id.org/edc/v0.0.1/ns/"
198-
},
199-
"@type": "https://w3id.org/edc/v0.0.1/ns/ContractDefinition",
198+
"@context": [
199+
"https://w3id.org/edc/connector/management/v2"
200+
],
201+
"@type": "ContractDefinition",
200202
"@id": "test-id",
201-
"edc:accessPolicyId": "group-access-policy-1234",
202-
"edc:contractPolicyId": "contract-policy-5678",
203-
"edc:assetsSelector": [
203+
"accessPolicyId": "group-access-policy-1234",
204+
"contractPolicyId": "contract-policy-5678",
205+
"assetsSelector": [
204206
{
205-
"@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
206-
"edc:operandLeft": "region",
207-
"edc:operator": "=",
208-
"edc:operandRight": "EU"
207+
"@type": "Criterion",
208+
"operandLeft": "region",
209+
"operator": "=",
210+
"operandRight": "EU"
209211
}
210212
]
211213
}

0 commit comments

Comments
 (0)