Skip to content

Commit a19b894

Browse files
ajnelson-nistajnelson-nist
authored
Merge pull request #154 from casework/bump_case_prov
Bump case-prov to 0.14.0; adapt examples for CASE 1.4.0
2 parents ae6aa0f + 3bb23cb commit a19b894

File tree

112 files changed

+43241
-51359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+43241
-51359
lines changed

‎examples/illustrations/Oresteia/Oresteia-prov.ttl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ kb:euripides-3696c710-161f-47af-9ae8-61b178611773
723723

724724
kb:investigative-action-30079255-a489-4dc2-ab5a-b9633a1cce95
725725
a
726-
time:ProperInterval ,
726+
time:Interval ,
727727
prov:Activity
728728
;
729729
time:hasBeginning kb:Start-9e0e52fc-16d6-5536-ab0c-d9728e2f35b8 ;
@@ -746,7 +746,7 @@ kb:investigative-action-30079255-a489-4dc2-ab5a-b9633a1cce95
746746

747747
kb:investigative-action-49e0d70c-f1bc-40a4-8866-45ddb8ad4e89
748748
a
749-
time:ProperInterval ,
749+
time:Interval ,
750750
prov:Activity
751751
;
752752
time:hasBeginning kb:Start-a2131571-c0fa-5fd0-97d6-777208d72098 ;
@@ -785,7 +785,7 @@ kb:investigative-action-49e0d70c-f1bc-40a4-8866-45ddb8ad4e89
785785

786786
kb:investigative-action-714255fe-ce2d-43e5-b0da-0910cc0e3997
787787
a
788-
time:ProperInterval ,
788+
time:Interval ,
789789
prov:Activity
790790
;
791791
time:hasBeginning kb:Start-e4a6a525-e2d0-5cea-a868-cf883f517ea5 ;
@@ -820,7 +820,7 @@ kb:investigative-action-714255fe-ce2d-43e5-b0da-0910cc0e3997
820820

821821
kb:investigative-action-7786ff3a-d40b-45a9-b65c-94ad10597b62
822822
a
823-
time:ProperInterval ,
823+
time:Interval ,
824824
prov:Activity
825825
;
826826
time:hasBeginning kb:Start-b80b4d9a-9047-557c-b253-de62930afbc0 ;
@@ -851,7 +851,7 @@ kb:investigative-action-7786ff3a-d40b-45a9-b65c-94ad10597b62
851851

852852
kb:investigative-action-b8fd94b9-ceae-4c2f-aa38-8cfaa98804fe
853853
a
854-
time:ProperInterval ,
854+
time:Interval ,
855855
prov:Activity ,
856856
prov:Agent
857857
;

‎examples/illustrations/Oresteia/Oresteia.json‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"uco-role": "https://ontology.unifiedcyberontology.org/uco/role/",
1717
"uco-tool": "https://ontology.unifiedcyberontology.org/uco/tool/",
1818
"uco-types": "https://ontology.unifiedcyberontology.org/uco/types/",
19-
"uco-vocabulary": "https://ontology.unifiedcyberontology.org/uco/vocabulary/",
2019
"xsd": "http://www.w3.org/2001/XMLSchema#"
2120
},
2221
"@id": "kb:bundle-3b13e958a-d975-41aa-b1bb-029d2b6707cd",
@@ -1069,10 +1068,7 @@
10691068
{
10701069
"@id": "kb:hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d",
10711070
"@type": "uco-types:Hash",
1072-
"uco-types:hashMethod": {
1073-
"@type": "uco-vocabulary:HashNameVocab",
1074-
"@value": "SHA256"
1075-
},
1071+
"uco-types:hashMethod": "SHA256",
10761072
"uco-types:hashValue": {
10771073
"@type": "xsd:hexBinary",
10781074
"@value": "7ea081166336119da78ee4bbdbd06840b94efe28988a2bdb0bcf2387a481e283"
@@ -1136,10 +1132,7 @@
11361132
{
11371133
"@id": "kb:hash-c6cc7dd6-1bf9-5454-9653-37caff09411d",
11381134
"@type": "uco-types:Hash",
1139-
"uco-types:hashMethod": {
1140-
"@type": "uco-vocabulary:HashNameVocab",
1141-
"@value": "SHA256"
1142-
},
1135+
"uco-types:hashMethod": "SHA256",
11431136
"uco-types:hashValue": {
11441137
"@type": "xsd:hexBinary",
11451138
"@value": "a13225720074371d56a4f4d5117fbb4953c5b1d316b31f21edcb7ed8fdf66c6e"
@@ -1204,10 +1197,7 @@
12041197
{
12051198
"@id": "kb:hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603",
12061199
"@type": "uco-types:Hash",
1207-
"uco-types:hashMethod": {
1208-
"@type": "uco-vocabulary:HashNameVocab",
1209-
"@value": "SHA256"
1210-
},
1200+
"uco-types:hashMethod": "SHA256",
12111201
"uco-types:hashValue": {
12121202
"@type": "xsd:hexBinary",
12131203
"@value": "0611ea093d19b1c73a5285ff43741dd77f2a8d983c1c71044eb072e44f5dcb0a"

‎examples/illustrations/Oresteia/Oresteia_validation-develop-2.0.0.ttl‎

Lines changed: 1 addition & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
44
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
55
@prefix sh: <http://www.w3.org/ns/shacl#> .
6-
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
7-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
86
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
97

108
[]
119
a sh:ValidationReport ;
12-
sh:conforms "false"^^xsd:boolean ;
10+
sh:conforms "true"^^xsd:boolean ;
1311
sh:result
1412
[
1513
a sh:ValidationResult ;
@@ -30,81 +28,6 @@
3028
sh:sourceConstraintComponent sh:InConstraintComponent ;
3129
sh:sourceShape observable:AccountFacet-accountType-in-shape ;
3230
sh:value "Phone" ;
33-
] ,
34-
[
35-
a sh:ValidationResult ;
36-
sh:focusNode <http://example.org/kb/hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603> ;
37-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
38-
sh:resultPath types:hashMethod ;
39-
sh:resultSeverity sh:Warning ;
40-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
41-
sh:sourceShape [
42-
sh:datatype xsd:string ;
43-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
44-
sh:path types:hashMethod ;
45-
sh:severity sh:Warning ;
46-
] ;
47-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
48-
] ,
49-
[
50-
a sh:ValidationResult ;
51-
sh:focusNode <http://example.org/kb/hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603> ;
52-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
53-
sh:resultPath types:hashMethod ;
54-
sh:resultSeverity sh:Info ;
55-
sh:sourceConstraintComponent sh:InConstraintComponent ;
56-
sh:sourceShape types:Hash-hashMethod-in-shape ;
57-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
58-
] ,
59-
[
60-
a sh:ValidationResult ;
61-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
62-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
63-
sh:resultPath types:hashMethod ;
64-
sh:resultSeverity sh:Warning ;
65-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
66-
sh:sourceShape [
67-
sh:datatype xsd:string ;
68-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
69-
sh:path types:hashMethod ;
70-
sh:severity sh:Warning ;
71-
] ;
72-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
73-
] ,
74-
[
75-
a sh:ValidationResult ;
76-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
77-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
78-
sh:resultPath types:hashMethod ;
79-
sh:resultSeverity sh:Info ;
80-
sh:sourceConstraintComponent sh:InConstraintComponent ;
81-
sh:sourceShape types:Hash-hashMethod-in-shape ;
82-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
83-
] ,
84-
[
85-
a sh:ValidationResult ;
86-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
87-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
88-
sh:resultPath types:hashMethod ;
89-
sh:resultSeverity sh:Warning ;
90-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
91-
sh:sourceShape [
92-
sh:datatype xsd:string ;
93-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
94-
sh:path types:hashMethod ;
95-
sh:severity sh:Warning ;
96-
] ;
97-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
98-
] ,
99-
[
100-
a sh:ValidationResult ;
101-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
102-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
103-
sh:resultPath types:hashMethod ;
104-
sh:resultSeverity sh:Info ;
105-
sh:sourceConstraintComponent sh:InConstraintComponent ;
106-
sh:sourceShape types:Hash-hashMethod-in-shape ;
107-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
10831
]
10932
;
11033
.

‎examples/illustrations/Oresteia/Oresteia_validation-develop.ttl‎

Lines changed: 1 addition & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
44
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
55
@prefix sh: <http://www.w3.org/ns/shacl#> .
6-
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
7-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
86
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
97

108
[]
119
a sh:ValidationReport ;
12-
sh:conforms "false"^^xsd:boolean ;
10+
sh:conforms "true"^^xsd:boolean ;
1311
sh:result
1412
[
1513
a sh:ValidationResult ;
@@ -30,81 +28,6 @@
3028
sh:sourceConstraintComponent sh:InConstraintComponent ;
3129
sh:sourceShape observable:AccountFacet-accountType-in-shape ;
3230
sh:value "Phone" ;
33-
] ,
34-
[
35-
a sh:ValidationResult ;
36-
sh:focusNode <http://example.org/kb/hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603> ;
37-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
38-
sh:resultPath types:hashMethod ;
39-
sh:resultSeverity sh:Warning ;
40-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
41-
sh:sourceShape [
42-
sh:datatype xsd:string ;
43-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
44-
sh:path types:hashMethod ;
45-
sh:severity sh:Warning ;
46-
] ;
47-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
48-
] ,
49-
[
50-
a sh:ValidationResult ;
51-
sh:focusNode <http://example.org/kb/hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603> ;
52-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
53-
sh:resultPath types:hashMethod ;
54-
sh:resultSeverity sh:Info ;
55-
sh:sourceConstraintComponent sh:InConstraintComponent ;
56-
sh:sourceShape types:Hash-hashMethod-in-shape ;
57-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
58-
] ,
59-
[
60-
a sh:ValidationResult ;
61-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
62-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
63-
sh:resultPath types:hashMethod ;
64-
sh:resultSeverity sh:Warning ;
65-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
66-
sh:sourceShape [
67-
sh:datatype xsd:string ;
68-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
69-
sh:path types:hashMethod ;
70-
sh:severity sh:Warning ;
71-
] ;
72-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
73-
] ,
74-
[
75-
a sh:ValidationResult ;
76-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
77-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
78-
sh:resultPath types:hashMethod ;
79-
sh:resultSeverity sh:Info ;
80-
sh:sourceConstraintComponent sh:InConstraintComponent ;
81-
sh:sourceShape types:Hash-hashMethod-in-shape ;
82-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
83-
] ,
84-
[
85-
a sh:ValidationResult ;
86-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
87-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
88-
sh:resultPath types:hashMethod ;
89-
sh:resultSeverity sh:Warning ;
90-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
91-
sh:sourceShape [
92-
sh:datatype xsd:string ;
93-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
94-
sh:path types:hashMethod ;
95-
sh:severity sh:Warning ;
96-
] ;
97-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
98-
] ,
99-
[
100-
a sh:ValidationResult ;
101-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
102-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
103-
sh:resultPath types:hashMethod ;
104-
sh:resultSeverity sh:Info ;
105-
sh:sourceConstraintComponent sh:InConstraintComponent ;
106-
sh:sourceShape types:Hash-hashMethod-in-shape ;
107-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
10831
]
10932
;
11033
.

‎examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl‎

Lines changed: 1 addition & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
44
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
55
@prefix sh: <http://www.w3.org/ns/shacl#> .
6-
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
7-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
86
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
97

108
[]
119
a sh:ValidationReport ;
12-
sh:conforms "false"^^xsd:boolean ;
10+
sh:conforms "true"^^xsd:boolean ;
1311
sh:result
1412
[
1513
a sh:ValidationResult ;
@@ -30,84 +28,6 @@
3028
sh:sourceConstraintComponent sh:InConstraintComponent ;
3129
sh:sourceShape observable:AccountFacet-accountType-in-shape ;
3230
sh:value "Phone" ;
33-
] ,
34-
[
35-
a sh:ValidationResult ;
36-
sh:focusNode <http://example.org/kb/hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603> ;
37-
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
38-
sh:resultPath types:hashMethod ;
39-
sh:resultSeverity sh:Violation ;
40-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
41-
sh:sourceShape [
42-
sh:datatype xsd:string ;
43-
sh:maxCount "1"^^xsd:integer ;
44-
sh:minCount "1"^^xsd:integer ;
45-
sh:nodeKind sh:Literal ;
46-
sh:path types:hashMethod ;
47-
] ;
48-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
49-
] ,
50-
[
51-
a sh:ValidationResult ;
52-
sh:focusNode <http://example.org/kb/hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603> ;
53-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
54-
sh:resultPath types:hashMethod ;
55-
sh:resultSeverity sh:Info ;
56-
sh:sourceConstraintComponent sh:InConstraintComponent ;
57-
sh:sourceShape types:Hash-hashMethod-in-shape ;
58-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
59-
] ,
60-
[
61-
a sh:ValidationResult ;
62-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
63-
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
64-
sh:resultPath types:hashMethod ;
65-
sh:resultSeverity sh:Violation ;
66-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
67-
sh:sourceShape [
68-
sh:datatype xsd:string ;
69-
sh:maxCount "1"^^xsd:integer ;
70-
sh:minCount "1"^^xsd:integer ;
71-
sh:nodeKind sh:Literal ;
72-
sh:path types:hashMethod ;
73-
] ;
74-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
75-
] ,
76-
[
77-
a sh:ValidationResult ;
78-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
79-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
80-
sh:resultPath types:hashMethod ;
81-
sh:resultSeverity sh:Info ;
82-
sh:sourceConstraintComponent sh:InConstraintComponent ;
83-
sh:sourceShape types:Hash-hashMethod-in-shape ;
84-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
85-
] ,
86-
[
87-
a sh:ValidationResult ;
88-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
89-
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
90-
sh:resultPath types:hashMethod ;
91-
sh:resultSeverity sh:Violation ;
92-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
93-
sh:sourceShape [
94-
sh:datatype xsd:string ;
95-
sh:maxCount "1"^^xsd:integer ;
96-
sh:minCount "1"^^xsd:integer ;
97-
sh:nodeKind sh:Literal ;
98-
sh:path types:hashMethod ;
99-
] ;
100-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
101-
] ,
102-
[
103-
a sh:ValidationResult ;
104-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
105-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
106-
sh:resultPath types:hashMethod ;
107-
sh:resultSeverity sh:Info ;
108-
sh:sourceConstraintComponent sh:InConstraintComponent ;
109-
sh:sourceShape types:Hash-hashMethod-in-shape ;
110-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
11131
]
11232
;
11333
.

0 commit comments

Comments
 (0)