-
Notifications
You must be signed in to change notification settings - Fork 16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Editorial rework merge #207
Closed
simantvermasap
wants to merge
101
commits into
International-Data-Spaces-Association:editorial-rework
from
simantvermasap:shapes-and-schemas-subtask
Closed
Changes from all commits
Commits
Show all changes
101 commits
Select commit
Hold shift + click to select a range
826d89a
adding DCAT into JSON schema
tr-sap e88ab43
catalog schema DCAT fix
tr-sap 193aa90
fix catalog schema - DCAT
tr-sap 9e3966f
fix catalog schema type error - DCAT
tr-sap 12e9947
DCAT catalog-shape added for Catalog class
tr-sap f5a05d3
fix typo in DCAT of catalog schema
tr-sap 9f9096b
fix type of dct:modified in DCAT of catalog schema
tr-sap 95e241b
DCAT dcat:CatalogRecord class added to catalog shape
tr-sap da30fb2
fix DCAT referecen in Resource catalog
tr-sap d6923e2
DCAT wrong property of Resource removed
tr-sap a5d74c5
Fix DCAT catalog property of Resource
tr-sap 6be2056
ResourceShape added to catalog-shape.ttl
tr-sap 865ee2e
RelationshipShape added to catalog-shape.ttl
tr-sap d746e19
DCAT fix issue in skos:Concept
tr-sap 831a3e3
DCAT ConceptShape ConceptSchemeShape and AgentShape added
tr-sap d18c2b5
DCAT fix of Dataset property
tr-sap 8475650
DCAT DatasetShape added
tr-sap 29c3057
DCAT DataServiceShape added
tr-sap 624d08c
DCAT Distribution catalog issue in type
tr-sap a5a288a
DCAT typo in property
tr-sap ae364a0
DCAT DataServiceShape added
tr-sap 8478bc0
add references for reused classes & datatypes
sebbader-sap bbc579b
Merge pull request #1 from tr-sap/review_sebastian
tr-sap db3a298
clean up on schema
tr-sap 48c64b1
properties changed
tr-sap ef55838
refactoring
tr-sap b22a2d3
refactoring
tr-sap 0a1638d
Merge branch 'main' into dcat-catalog-schema-and-shape
sebbader-sap 6400b06
change dct:issued from string to dateTime
sebbader-sap aba4407
fix dct:language from xsd:string to referencing a resource
sebbader-sap 4e92cc0
correcting hasPolicy declarations
sebbader-sap fdafeea
reviewing the catalog json schema
sebbader-sap 3184fda
refactor catalog json schema
sebbader-sap 907e0ef
add odrl policy json schema
sebbader-sap 42c7d42
fix syntax bugs in catalog json schema and adding foaf to the context…
sebbader-sap a3b96b6
fix bugs in catalog and contract json schemas
sebbader-sap 0912192
fix examples to match to the catalog and contract json schemas
sebbader-sap 87186d8
replace relative reference to the contract-schema.json with an absolu…
sebbader-sap 8b895cf
Merge branch 'main' into dcat-catalog-schema-and-shape
sebbader-sap 5ff009c
fix findings from mkollenstart's review
sebbader-sap 74f77d2
testing negotiation-subtask-1.1 branch
SimantVerma-Bcone 8ae42d5
removing the test change
SimantVerma-Bcone dcb8895
unwnated characters
SimantVerma-Bcone 9e6ec39
Task #1: fix schemas and examples in "negotiation"
SimantVerma-Bcone 9818c39
correct references to GitHub raw files
sebbader-sap 8c70bfc
making 'required' field compatible to json 2019-09
SimantVerma-Bcone e8c8527
changes suggested by Sebastian
SimantVerma-Bcone 71d19e2
changes to processId, correcting ref, removing Sec
SimantVerma-Bcone aa6626a
chnages since last review
SimantVerma-Bcone d1e526a
left over change
SimantVerma-Bcone 01e1698
missing s in dspace
SimantVerma-Bcone f8cf0d6
removing RightOperand property
SimantVerma-Bcone 6ef346a
chnage in Permission, Json validated
SimantVerma-Bcone ef6d2d5
catalog subtask changes
SimantVerma-Bcone 53bd73d
Merge commit '6ef346af1ba959845dac79e2de08093d548741c8' into dcat-cat…
sebbader-sap fabc4d6
Merge branch 'main' into dcat-catalog-schema-and-shape
sebbader-sap a0cabb1
reverting dspace:filter type to object
SimantVerma-Bcone f4250a3
re-introducing updates to the json schemas
sebbader-sap 7845f6d
fix filter in contract-request-message-schema
sebbader-sap 8c04381
Merge branch 'dcat-catalog-schema-and-shape' into catalog-subtask
sebbader-sap 7a211c4
fixing schema in "Transfer"
SimantVerma-Bcone 8410c2e
Merge pull request #4 from simantvermasap/transfer-subtask
simantvermasap 1b110bf
Merge pull request #3 from simantvermasap/catalog-subtask
simantvermasap 6e9d024
Trying Shapes validation with Json-LD
SimantVerma-Bcone 0f60ffa
debugging catalog shapes
sebbader-sap 5753e20
fixing shapes in Catalog
SimantVerma-Bcone 58689ac
Negotaitaion Shapes validation
SimantVerma-Bcone 8c93621
Merge branch 'dcat-catalog-schema-and-shape' into negotiation-subtask…
sebbader-sap 6483f07
Remove the ContractAgreement shape
sebbader-sap 135bcb2
add the AgreementShape
sebbader-sap 69b2816
Negotiation shapes correction
SimantVerma-Bcone 60fafe8
Merge branch 'negotiation-subtask-1.1' of https://github.com/simantve…
SimantVerma-Bcone 18e58da
conflict merge
SimantVerma-Bcone 60ad44b
schema and shapes re-validating after merge
SimantVerma-Bcone a3a62d2
change assigner and assignee to string
sebbader-sap ff050aa
introduve verifiable credential structure to agreement msg
sebbader-sap 6c2c546
adjust agreement msg example to vc pattern
sebbader-sap 6b4a32e
comment error
SimantVerma-Bcone 96e3f87
Catalog shapes changes
SimantVerma-Bcone 35bd224
Shapes and schema validation for Transfer
SimantVerma-Bcone fb2c1a8
Introduce sh:IRI pattern for agreementId
sebbader-sap b117232
correction for dspace:reason and others
SimantVerma-Bcone 37cfa5e
dataset schema and puml
SimantVerma-Bcone 85f8b45
Update catalog-error-schema.json - remove "dspace:code" and "dspace:r…
simantvermasap a2b7f7f
Update dataset-schema.json - remove "dct:title" and "dct:description"…
simantvermasap cf2cf76
Merge branch 'main' into catalog-subtask
SimantVerma-Bcone 23efadf
agreement verification change
SimantVerma-Bcone e2eb7b4
Merge branch 'main' into transfer-subtask
SimantVerma-Bcone 89712b2
Transfer Messages - shapes and schema validation
SimantVerma-Bcone 0784b38
removing "@id" from transfer messages
SimantVerma-Bcone fe55630
Merge branch 'shapes-and-schemas-subtask' of https://github.com/siman…
SimantVerma-Bcone 3633583
Merge transfer into shapes-and-schemas-subtask
SimantVerma-Bcone a9ceee9
Merge remote-tracking branch 'origin/negotiation-subtask-1.1' into sh…
SimantVerma-Bcone 8aaa0f1
correction for catalog schema
SimantVerma-Bcone 0cb569b
error handling
SimantVerma-Bcone 97bbc9a
pull request #11 changes
SimantVerma-Bcone 95c8e74
pull request changes
SimantVerma-Bcone 1a83c11
Merge branch 'International-Data-Spaces-Association:main' into shapes…
simantvermasap 67c6491
Merge branch 'shapes-and-schemas-subtask' into editorial-rework
SimantVerma-Bcone 0a8d7fb
new chnages to editorial-rework
SimantVerma-Bcone ada9e22
merge editorial-rework to shapes-and-schemas
SimantVerma-Bcone File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,4 +33,5 @@ dspace_shapes:CatalogRequestMessageShape | |
a sh:PropertyShape ; | ||
sh:path dspace:filter ; | ||
] ; | ||
|
||
. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
@prefix owl: <http://www.w3.org/2002/07/owl#> . | ||
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . | ||
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . | ||
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . | ||
@prefix dct: <http://purl.org/dc/terms/> . | ||
@prefix dcat: <http://www.w3.org/ns/dcat#> . | ||
@prefix odrl: <http://www.w3.org/ns/odrl/2/> . | ||
@prefix cred: <https://www.w3.org/2018/credentials#> . | ||
@prefix sec: <https://w3id.org/security#> . | ||
@prefix prov: <http://www.w3.org/ns/prov#> . | ||
|
||
@prefix dspace: <https://w3id.org/dspace/v0.8/> . | ||
@prefix dspace_shapes: <https://w3id.org/dspace/shapes/v0.8/> . | ||
|
||
@prefix sh: <http://www.w3.org/ns/shacl#> . | ||
|
||
dspace_shapes: | ||
a owl:Ontology ; | ||
sh:declare [ | ||
sh:prefix "rdf" ; | ||
sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ; | ||
] ; | ||
sh:declare [ | ||
sh:prefix "dspace" ; | ||
sh:namespace "https://w3id.org/dspace/v0.8/"^^xsd:anyURI ; | ||
] ; | ||
. | ||
|
||
dspace_shapes:DatasetShape | ||
a sh:NodeShape ; | ||
sh:targetClass dcat:Dataset ; | ||
|
||
sh:property [ | ||
a sh:PropertyShape ; | ||
sh:path dcat:distribution ; | ||
simantvermasap marked this conversation as resolved.
Show resolved
Hide resolved
|
||
sh:class dcat:Distribution ; | ||
sh:minCount 0; | ||
sh:severity sh:Violation ; | ||
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dcat:distribution property must point to a dcat:Distribution."@en ; | ||
] ; | ||
|
||
sh:property [ | ||
a sh:PropertyShape ; | ||
sh:path dcat:keyword ; | ||
sh:datatype xsd:string ; | ||
sh:minCount 0; | ||
sh:severity sh:Violation ; | ||
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dcat:keyword property must point to a xsd:string field."@en ; | ||
] ; | ||
|
||
sh:property [ | ||
a sh:PropertyShape ; | ||
sh:path dct:description ; | ||
sh:datatype rdf:langString ; | ||
sh:minCount 0; | ||
sh:severity sh:Violation ; | ||
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dct:description property must point to a rdf:langString field."@en ; | ||
] ; | ||
|
||
sh:property [ | ||
a sh:PropertyShape ; | ||
sh:path dct:title ; | ||
sh:datatype xsd:string ; | ||
simantvermasap marked this conversation as resolved.
Show resolved
Hide resolved
|
||
sh:minCount 0; | ||
sh:severity sh:Violation ; | ||
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dct:title property must point to a xsd:string field."@en ; | ||
] ; | ||
|
||
sh:property [ | ||
a sh:PropertyShape ; | ||
sh:path odrl:hasPolicy ; | ||
sh:class odrl:Policy ; | ||
sh:severity sh:Violation ; | ||
sh:minCount 0; | ||
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): An odrl:hasPolicy property must point to an odrl:Policy."@en ; | ||
] ; | ||
|
||
. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,4 +61,4 @@ | |
} | ||
} | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,4 +44,4 @@ | |
] | ||
} | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,4 +21,4 @@ | |
}, | ||
"dspace:signature": {}, | ||
"dspace:callbackAddress": "https://......" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,4 +10,4 @@ | |
"@language": "en" | ||
} | ||
] | ||
} | ||
} |
12 changes: 6 additions & 6 deletions
12
releases/v0.8/negotiation/message/contract-negotiation.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"@context": "https://w3id.org/dspace/v0.8/context.json", | ||
"@type": "dspace:ContractNegotiation", | ||
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", | ||
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833", | ||
"dspace:state": "dspace:REQUESTED" | ||
} | ||
"@context": "https://w3id.org/dspace/v0.8/context.json", | ||
"@type": "dspace:ContractNegotiation", | ||
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab", | ||
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833", | ||
"dspace:state": "dspace:REQUESTED" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,4 +19,4 @@ | |
}] | ||
}, | ||
"dspace:callbackAddress": "https://......" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,4 +9,4 @@ | |
"odrl:target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88" | ||
}, | ||
"dspace:callbackAddress": "https://......" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,4 +8,4 @@ | |
{}, | ||
{} | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,4 +8,4 @@ | |
{}, | ||
{} | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,4 +8,4 @@ | |
{}, | ||
{} | ||
] | ||
} | ||
} |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In #184, we removed the explicit listing of properties that have a linked class in the .puml diagrams. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. see previous comment |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should line 37 be indented then as well?