diff --git a/examples/illustrations/cell_site/README.md b/examples/illustrations/cell_site/README.md
index 4f2d2d0d..471d4fea 100644
--- a/examples/illustrations/cell_site/README.md
+++ b/examples/illustrations/cell_site/README.md
@@ -102,7 +102,7 @@ The location of a Cell Site can change over time when it is moved by a telecommu
},
{
"@id": "kb:cdf48c35-c65d-41e4-843b-720f1ad24ab3",
- "@type": "uco-observable:ObservableRelationship",
+ "@type": "uco-core:Relationship",
"uco-observable:startTime": {
"@type": "xsd:dateTime",
"@value": "2016-12-12T09:10:11Z"
@@ -334,7 +334,7 @@ Per practice of this example organization, the derivation of the relationship is
},
{
"@id": "kb:relationship-7cb73eaa-f2e5-45c1-b84e-0e97d0a828d4",
- "@type": "uco-observable:ObservableRelationship",
+ "@type": "uco-core:Relationship",
"case-investigation:wasDerivedFrom": {
"@id": "kb:observation-21841f2a-6c14-48d7-b9d3-f081d43bc19b"
},
diff --git a/examples/illustrations/cell_site/cell_site.json b/examples/illustrations/cell_site/cell_site.json
index 2d43bafd..f42c8cc3 100644
--- a/examples/illustrations/cell_site/cell_site.json
+++ b/examples/illustrations/cell_site/cell_site.json
@@ -152,7 +152,7 @@
},
{
"@id": "kb:cdf48c35-c65d-41e4-843b-720f1ad24ab3",
- "@type": "uco-observable:ObservableRelationship",
+ "@type": "uco-core:Relationship",
"uco-core:isDirectional": true,
"uco-core:kindOfRelationship": "Located_At",
"uco-core:source": {
@@ -291,7 +291,7 @@
},
{
"@id": "kb:relationship-7cb73eaa-f2e5-45c1-b84e-0e97d0a828d4",
- "@type": "uco-observable:ObservableRelationship",
+ "@type": "uco-core:Relationship",
"case-investigation:wasDerivedFrom": {
"@id": "kb:observation-21841f2a-6c14-48d7-b9d3-f081d43bc19b"
},
diff --git a/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl b/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl
index 3e36f0f0..fbc74a5d 100644
--- a/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl
+++ b/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl
@@ -1,5 +1,4 @@
@prefix core: .
-@prefix observable: .
@prefix owl: .
@prefix rdf: .
@prefix rdfs: .
@@ -8,44 +7,17 @@
[]
a sh:ValidationReport ;
- sh:conforms "false"^^xsd:boolean ;
- sh:result
- [
- a sh:ValidationResult ;
- sh:focusNode ;
- sh:resultMessage "Value does not have class observable:Observable" ;
- sh:resultPath core:target ;
- sh:resultSeverity sh:Violation ;
- sh:sourceConstraintComponent sh:ClassConstraintComponent ;
- sh:sourceShape [
- sh:class observable:Observable ;
- sh:path core:target ;
- ] ;
- sh:value ;
- ] ,
- [
- a sh:ValidationResult ;
- sh:focusNode ;
- sh:resultMessage "Value does not have class observable:Observable" ;
- sh:resultPath core:target ;
- sh:resultSeverity sh:Violation ;
- sh:sourceConstraintComponent sh:ClassConstraintComponent ;
- sh:sourceShape [
- sh:class observable:Observable ;
- sh:path core:target ;
- ] ;
- sh:value ;
- ] ,
- [
- a sh:ValidationResult ;
- sh:focusNode ;
- sh:resultMessage "UcoThings are suggested to end with a UUID." ;
- sh:resultSeverity sh:Info ;
- sh:sourceConstraint [
- a sh:SPARQLConstraint ;
- rdfs:seeAlso ;
- sh:message "UcoThings are suggested to end with a UUID."@en ;
- sh:select '''
+ sh:conforms "true"^^xsd:boolean ;
+ sh:result [
+ a sh:ValidationResult ;
+ sh:focusNode ;
+ sh:resultMessage "UcoThings are suggested to end with a UUID." ;
+ sh:resultSeverity sh:Info ;
+ sh:sourceConstraint [
+ a sh:SPARQLConstraint ;
+ rdfs:seeAlso ;
+ sh:message "UcoThings are suggested to end with a UUID."@en ;
+ sh:select '''
PREFIX rdfs:
PREFIX core:
SELECT $this
@@ -60,11 +32,10 @@
)
}
''' ;
- ] ;
- sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
- sh:sourceShape core:UcoThing-identifier-regex-shape ;
- sh:value ;
- ]
- ;
+ ] ;
+ sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
+ sh:sourceShape core:UcoThing-identifier-regex-shape ;
+ sh:value ;
+ ] ;
.
diff --git a/examples/illustrations/cell_site/cell_site_validation-unstable.ttl b/examples/illustrations/cell_site/cell_site_validation-unstable.ttl
index 319fce10..fbc74a5d 100644
--- a/examples/illustrations/cell_site/cell_site_validation-unstable.ttl
+++ b/examples/illustrations/cell_site/cell_site_validation-unstable.ttl
@@ -1,5 +1,4 @@
@prefix core: .
-@prefix observable: .
@prefix owl: .
@prefix rdf: .
@prefix rdfs: .
@@ -8,48 +7,17 @@
[]
a sh:ValidationReport ;
- sh:conforms "false"^^xsd:boolean ;
- sh:result
- [
- a sh:ValidationResult ;
- sh:focusNode ;
- sh:resultMessage "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
- sh:resultPath core:target ;
- sh:resultSeverity sh:Warning ;
- sh:sourceConstraintComponent sh:ClassConstraintComponent ;
- sh:sourceShape [
- sh:class observable:Observable ;
- sh:message "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
- sh:path core:target ;
- sh:severity sh:Warning ;
- ] ;
- sh:value ;
- ] ,
- [
- a sh:ValidationResult ;
- sh:focusNode ;
- sh:resultMessage "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
- sh:resultPath core:target ;
- sh:resultSeverity sh:Warning ;
- sh:sourceConstraintComponent sh:ClassConstraintComponent ;
- sh:sourceShape [
- sh:class observable:Observable ;
- sh:message "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
- sh:path core:target ;
- sh:severity sh:Warning ;
- ] ;
- sh:value ;
- ] ,
- [
- a sh:ValidationResult ;
- sh:focusNode ;
- sh:resultMessage "UcoThings are suggested to end with a UUID." ;
- sh:resultSeverity sh:Info ;
- sh:sourceConstraint [
- a sh:SPARQLConstraint ;
- rdfs:seeAlso ;
- sh:message "UcoThings are suggested to end with a UUID."@en ;
- sh:select '''
+ sh:conforms "true"^^xsd:boolean ;
+ sh:result [
+ a sh:ValidationResult ;
+ sh:focusNode ;
+ sh:resultMessage "UcoThings are suggested to end with a UUID." ;
+ sh:resultSeverity sh:Info ;
+ sh:sourceConstraint [
+ a sh:SPARQLConstraint ;
+ rdfs:seeAlso ;
+ sh:message "UcoThings are suggested to end with a UUID."@en ;
+ sh:select '''
PREFIX rdfs:
PREFIX core:
SELECT $this
@@ -64,11 +32,10 @@
)
}
''' ;
- ] ;
- sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
- sh:sourceShape core:UcoThing-identifier-regex-shape ;
- sh:value ;
- ]
- ;
+ ] ;
+ sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
+ sh:sourceShape core:UcoThing-identifier-regex-shape ;
+ sh:value ;
+ ] ;
.
diff --git a/examples/illustrations/cell_site/src/cell_site-cdr-site-location.json b/examples/illustrations/cell_site/src/cell_site-cdr-site-location.json
index 176cce60..d3bfcd1b 100644
--- a/examples/illustrations/cell_site/src/cell_site-cdr-site-location.json
+++ b/examples/illustrations/cell_site/src/cell_site-cdr-site-location.json
@@ -59,7 +59,7 @@
},
{
"@id": "kb:relationship-7cb73eaa-f2e5-45c1-b84e-0e97d0a828d4",
- "@type": "uco-observable:ObservableRelationship",
+ "@type": "uco-core:Relationship",
"case-investigation:wasDerivedFrom": {
"@id": "kb:observation-21841f2a-6c14-48d7-b9d3-f081d43bc19b"
},
diff --git a/examples/illustrations/cell_site/src/cell_site-location-relationship.json b/examples/illustrations/cell_site/src/cell_site-location-relationship.json
index 632d0db6..2adf90fa 100644
--- a/examples/illustrations/cell_site/src/cell_site-location-relationship.json
+++ b/examples/illustrations/cell_site/src/cell_site-location-relationship.json
@@ -19,7 +19,7 @@
},
{
"@id": "kb:cdf48c35-c65d-41e4-843b-720f1ad24ab3",
- "@type": "uco-observable:ObservableRelationship",
+ "@type": "uco-core:Relationship",
"uco-observable:startTime": {
"@type": "xsd:dateTime",
"@value": "2016-12-12T09:10:11Z"