diff --git a/dependencies/CASE-develop b/dependencies/CASE-develop index 279d2b79..caf5bd3c 160000 --- a/dependencies/CASE-develop +++ b/dependencies/CASE-develop @@ -1 +1 @@ -Subproject commit 279d2b7927bbce9c40409939b922a97e5f35f08a +Subproject commit caf5bd3ca3d69929fba2eac50f3db663c6d866a9 diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index d9a6f6f9..430b6a53 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit d9a6f6f92ac56f719bd882e901f3f306fe7e0a85 +Subproject commit 430b6a53857ff9571014024909de2657a7291e0b diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 31603ae6..3f88c4c7 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 31603ae6187f94e56157b365ae31c47bdaa29e5f +Subproject commit 3f88c4c7d977c4f4fc64290e05a30b1c1c1f6d27 diff --git a/ontology/CASE-develop.ttl b/ontology/CASE-develop.ttl index b51e735a..1947c731 100644 --- a/ontology/CASE-develop.ttl +++ b/ontology/CASE-develop.ttl @@ -917,25 +917,14 @@ uco-owl:Disjointedness-DP-OP-shape . uco-owl:List-shape - a sh:NodeShape ; - sh:property [ - a sh:PropertyShape ; - sh:maxCount "1"^^xsd:integer ; - sh:path rdf:first ; - ] ; - sh:sparql [ - a sh:SPARQLConstraint ; - rdfs:comment "This requirement is determined from review of the canonical parsing process in Section 3 of the OWL 2 mapping to RDF. Table 5 removes any triple matching the pattern 'x a rdf:List`. All other references throughout Section 3 to rdf:first are identified as blank nodes. Therefore, any non-blank node that is an rdf:List will not be mapped and consumed by the mapping process, making the graph non-conformant with OWL 2 DL."@en ; - rdfs:seeAlso ; - sh:message "The subject of a triple with rdf:first as predicate must be a blank node."@en ; - sh:select """ - SELECT $this - WHERE { - FILTER isIRI($this) - } - """ ; - ] ; - sh:targetSubjectsOf rdf:first ; + a sh:Shape ; + rdfs:comment "This shape's functionality has been exported"@en ; + rdfs:seeAlso + uco-owl:Sequence-shape , + uco-owl:rdf-first-subjects-shape , + uco-owl:rdf-rest-subjects-shape + ; + sh:deactivated "true"^^xsd:boolean ; . uco-owl:ObjectProperty-shacl-constraints-shape @@ -988,6 +977,75 @@ uco-owl:ObjectProperty-shacl-constraints-shape sh:targetClass owl:ObjectProperty ; . +uco-owl:Sequence-shape + a sh:NodeShape ; + rdfs:comment "This shape intentionally has no target declaration. It is instead intended to be incorporated using 'sh:node'."@en ; + rdfs:seeAlso ; + sh:description "This shape is determined from review of the canonical parsing process in Section 3 of the OWL 2 mapping to RDF, particularly Tables 3 and 5. Table 5 removes any triple matching the pattern 'x a rdf:List`. All other references throughout Section 3 to rdf:first are in the context of mapping a Sequence in OWL structure translation, and are denoted as blank nodes, starting with Table 3. A non-blank node that is an rdf:List and used with a sequence-valued property IRI in the OWL namespace will not be mapped and consumed by the mapping process, making the graph non-conformant with OWL 2 DL. But a non-blank node that is an rdf:List can be used if not directly attached to a sequence-valued property IRI in the OWL namespace."@en ; + sh:xone ( + [ + a sh:NodeShape ; + sh:hasValue rdf:nil ; + ] + [ + a sh:NodeShape ; + sh:nodeKind sh:BlankNode ; + sh:property [ + a sh:PropertyShape ; + sh:path [ + sh:oneOrMorePath rdf:rest ; + ] ; + sh:xone ( + [ + a sh:NodeShape ; + sh:hasValue rdf:nil ; + ] + [ + a sh:NodeShape ; + sh:nodeKind sh:BlankNode ; + sh:property [ + a sh:PropertyShape ; + sh:maxCount "1"^^xsd:integer ; + sh:minCount "1"^^xsd:integer ; + sh:path rdf:first ; + ] ; + ] + ) ; + ] ; + ] + ) ; + . + +uco-owl:disjointUnionOf-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:disjointUnionOf ; + ] ; + sh:targetSubjectsOf owl:disjointUnionOf ; + . + +uco-owl:distinctMembers-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:distinctMembers ; + ] ; + sh:targetSubjectsOf owl:distinctMembers ; + . + +uco-owl:hasKey-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:hasKey ; + ] ; + sh:targetSubjectsOf owl:hasKey ; + . + uco-owl:incompatibleWith-direct-import-shape a sh:PropertyShape ; rdfs:seeAlso ; @@ -1023,6 +1081,46 @@ uco-owl:incompatibleWith-imported-version-iri-shape sh:targetObjectsOf owl:incompatibleWith ; . +uco-owl:intersectionOf-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:intersectionOf ; + ] ; + sh:targetSubjectsOf owl:intersectionOf ; + . + +uco-owl:members-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:members ; + ] ; + sh:targetSubjectsOf owl:members ; + . + +uco-owl:onProperties-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:onProperties ; + ] ; + sh:targetSubjectsOf owl:onProperties ; + . + +uco-owl:oneOf-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:oneOf ; + ] ; + sh:targetSubjectsOf owl:oneOf ; + . + uco-owl:ontologyIRI-versionIRI-prerequisite-shape a sh:NodeShape ; rdfs:seeAlso ; @@ -1031,6 +1129,60 @@ uco-owl:ontologyIRI-versionIRI-prerequisite-shape sh:targetSubjectsOf owl:versionIRI ; . +uco-owl:propertyChainAxiom-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:propertyChainAxiom ; + ] ; + sh:targetSubjectsOf owl:propertyChainAxiom ; + . + +uco-owl:rdf-first-subjects-shape + a sh:NodeShape ; + sh:property + [ + a sh:PropertyShape ; + sh:maxCount "1"^^xsd:integer ; + sh:path rdf:first ; + ] , + [ + a sh:PropertyShape ; + sh:minCount "1"^^xsd:integer ; + sh:path rdf:rest ; + ] + ; + sh:targetSubjectsOf rdf:first ; + . + +uco-owl:rdf-rest-subjects-shape + a sh:NodeShape ; + sh:property + [ + a sh:PropertyShape ; + sh:maxCount "1"^^xsd:integer ; + sh:path rdf:rest ; + ] , + [ + a sh:PropertyShape ; + sh:minCount "1"^^xsd:integer ; + sh:path rdf:first ; + ] + ; + sh:targetSubjectsOf rdf:rest ; + . + +uco-owl:unionOf-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:unionOf ; + ] ; + sh:targetSubjectsOf owl:unionOf ; + . + uco-owl:versionIRI-multiversion-shape a sh:PropertyShape ; rdfs:seeAlso ; @@ -1048,6 +1200,16 @@ uco-owl:versionIRI-nodeKind-shape sh:targetSubjectsOf owl:versionIRI ; . +uco-owl:withRestrictions-subjects-shape + a sh:NodeShape ; + sh:property [ + a sh:PropertyShape ; + sh:node uco-owl:Sequence-shape ; + sh:path owl:withRestrictions ; + ] ; + sh:targetSubjectsOf owl:withRestrictions ; + . + action:Action a owl:Class , diff --git a/ontology/CASE-unstable-2.0.0.ttl b/ontology/CASE-unstable-2.0.0.ttl index 8b004127..cce18d37 100644 --- a/ontology/CASE-unstable-2.0.0.ttl +++ b/ontology/CASE-unstable-2.0.0.ttl @@ -1488,7 +1488,7 @@ action:ActionLifecycle owl:Class , sh:NodeShape ; - rdfs:subClassOf action:Action ; + rdfs:subClassOf action:ActionPattern ; rdfs:label "ActionLifecycle"@en ; rdfs:comment "An action lifecycle is an action pattern consisting of an ordered set of multiple actions or subordinate action lifecycles."@en ; sh:property