Skip to content

Commit aa091ac

Browse files
Raphael-GazzottiRaphael-Gazzotti
committed
Draft for #505
Introduce usageAgreement.schema.tpl.json, license property modified by usageCondition.
1 parent ee9005e commit aa091ac

File tree

5 files changed

+112
-38
lines changed

5 files changed

+112
-38
lines changed

‎schemas/data/usageAgreement.schema.tpl.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"_type": "core:UsageAgreement",
3+
"required": [
4+
"fullName",
5+
"issuingBody",
6+
"jurisdiction",
7+
"modificationRights",
8+
"template",
9+
"shortName"
10+
],
11+
"properties": {
12+
"contact": {
13+
"_instruction": "Enter the contact information for the party issuing this usage agreement.",
14+
"_linkedCategories": [
15+
"legalPerson"
16+
]
17+
},
18+
"fullName": {
19+
"type": "string",
20+
"_instruction": "Enter the full name of this usage agreement."
21+
},
22+
"issuingBody": {
23+
"_instruction": "Enter the organization issuing this usage agreement.",
24+
"_linkedTypes": [
25+
"core:Organization"
26+
]
27+
},
28+
"jurisdiction": {
29+
"_instruction": "Enter the jurisdiction in which this usage agreement was issued.",
30+
"_linkedTypes": [
31+
"core:Jurisdiction"
32+
]
33+
},
34+
"modificationRights": {
35+
"type": "array",
36+
"minItems": 1,
37+
"uniqueItems": true,
38+
"_instruction": "Add all the types of modifications that are allowed under this usage agreement.",
39+
"_linkedTypes": [
40+
"modificationRights"
41+
]
42+
},
43+
"shortName": {
44+
"type": "string",
45+
"_instruction": "Enter a short name (or alias) for this usage agreement that could be used as a shortened display title (e.g., for web services with too little space to display the full name)."
46+
},
47+
"source": {
48+
"type": "array",
49+
"minItems": 1,
50+
"uniqueItems": true,
51+
"_instruction": "Add all licenses or usage agreements that served as references in the creation of this usage agreement.",
52+
"_linkedTypes": [
53+
"core:License",
54+
"core:UsageAgreement"
55+
]
56+
},
57+
"template": {
58+
"type": "string",
59+
"_instruction": "Enter the web resource of the usage agreement template.",
60+
"_linkedTypes": [
61+
"core:WebResource"
62+
]
63+
}
64+
}
65+
}

‎schemas/products/datasetVersion.schema.tpl.json‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"digitalIdentifier",
77
"ethicsAssessment",
88
"experimentalApproach",
9-
"license",
10-
"technique"
9+
"technique",
10+
"usageCondition"
1111
],
1212
"properties": {
1313
"author": {
@@ -90,13 +90,6 @@
9090
"core:DatasetVersion"
9191
]
9292
},
93-
"license": {
94-
"_instruction": "Add the license or an online available data usage agreement for this dataset version.",
95-
"_linkedTypes": [
96-
"core:License",
97-
"core:WebResource"
98-
]
99-
},
10093
"preparationDesign": {
10194
"type": "array",
10295
"minItems": 1,
@@ -144,6 +137,16 @@
144137
"_linkedCategories": [
145138
"technique"
146139
]
140+
},
141+
"usageCondition": {
142+
"type": "array",
143+
"minItems": 1,
144+
"uniqueItems": true,
145+
"_instruction": "Add all licenses or available data usage agreements applicable to this dataset version.",
146+
"_linkedTypes": [
147+
"core:License",
148+
"core:UsageAgreement"
149+
]
147150
}
148151
}
149152
}

‎schemas/products/metaDataModelVersion.schema.tpl.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"_type": "core:MetaDataModelVersion",
33
"_extends": "products/researchProductVersion.schema.tpl.json",
44
"required": [
5-
"license",
6-
"type"
5+
"type",
6+
"usageCondition"
77
],
88
"properties": {
99
"developer": {
@@ -37,12 +37,6 @@
3737
"core:MetaDataModelVersion"
3838
]
3939
},
40-
"license": {
41-
"_instruction": "Add the license of this (meta)data model version.",
42-
"_linkedTypes": [
43-
"core:License"
44-
]
45-
},
4640
"serializationFormat": {
4741
"type": "array",
4842
"minItems": 1,
@@ -66,6 +60,16 @@
6660
"_linkedTypes": [
6761
"controlledTerms:MetaDataModelType"
6862
]
63+
},
64+
"usageCondition": {
65+
"type": "array",
66+
"minItems": 1,
67+
"uniqueItems": true,
68+
"_instruction": "Add all licenses or available data usage agreements applicable to this (meta)data model version.",
69+
"_linkedTypes": [
70+
"core:License",
71+
"core:UsageAgreement"
72+
]
6973
}
7074
}
7175
}

‎schemas/products/modelVersion.schema.tpl.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"_extends": "products/researchProductVersion.schema.tpl.json",
44
"required": [
55
"format",
6-
"license"
6+
"usageCondition"
77
],
88
"properties": {
99
"configuration": {
@@ -71,15 +71,6 @@
7171
"core:ModelVersion"
7272
]
7373
},
74-
"license": {
75-
"type": "array",
76-
"minItems": 1,
77-
"uniqueItems": true,
78-
"_instruction": "Add all licenses of this computational model version.",
79-
"_linkedTypes": [
80-
"core:License"
81-
]
82-
},
8374
"outputData": {
8475
"type": "array",
8576
"minItems": 1,
@@ -91,6 +82,16 @@
9182
"core:FileBundle",
9283
"core:WebResource"
9384
]
85+
},
86+
"usageCondition": {
87+
"type": "array",
88+
"minItems": 1,
89+
"uniqueItems": true,
90+
"_instruction": "Add all licenses or available data usage agreements applicable to this computational model version.",
91+
"_linkedTypes": [
92+
"core:License",
93+
"core:UsageAgreement"
94+
]
9495
}
9596
}
9697
}

‎schemas/products/softwareVersion.schema.tpl.json‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"device",
1010
"feature",
1111
"language",
12-
"license",
1312
"operatingSystem",
14-
"programmingLanguage"
13+
"programmingLanguage",
14+
"usageCondition"
1515
],
1616
"properties": {
1717
"applicationCategory": {
@@ -103,15 +103,6 @@
103103
"controlledTerms:Language"
104104
]
105105
},
106-
"license": {
107-
"type": "array",
108-
"minItems": 1,
109-
"uniqueItems": true,
110-
"_instruction": "Add all licenses of this software version.",
111-
"_linkedTypes": [
112-
"core:License"
113-
]
114-
},
115106
"operatingSystem": {
116107
"type": "array",
117108
"minItems": 1,
@@ -147,6 +138,16 @@
147138
"items": {
148139
"type": "string"
149140
}
141+
},
142+
"usageCondition": {
143+
"type": "array",
144+
"minItems": 1,
145+
"uniqueItems": true,
146+
"_instruction": "Add all licenses or available data usage agreements applicable to this software version.",
147+
"_linkedTypes": [
148+
"core:License",
149+
"core:UsageAgreement"
150+
]
150151
}
151152
}
152153
}

0 commit comments

Comments
 (0)