Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

Commit 56a34e1

Browse files
author
Haydar Akyürek
authored
Merge pull request #333 from International-Data-Spaces-Association/fix/4.0-hotfixes
Minor fixes for 4.0.0 release
2 parents e1333f1 + 30ad797 commit 56a34e1

File tree

17 files changed

+48
-38
lines changed

17 files changed

+48
-38
lines changed

‎Ontology.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ids:
3737
<https://github.com/mkollenstart> ;
3838
dct:publisher ids:IDSA ;
3939
dct:created "2017-09-26"^^xsd:date ;
40-
dct:modified "2020-08-07"^^xsd:date ;
40+
dct:modified "2020-08-10"^^xsd:date ;
4141
owl:versionInfo "4.0.0" ;
4242
owl:versionIRI <https://w3id.org/idsa/core/4.0.0> ;
4343
vann:preferredNamespaceUri "https://w3id.org/idsa/core/" ;

‎Shacl.ttl‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ shapes:
3030
<https://github.com/HaydarAk> ;
3131
dct:publisher ids:IDSA ;
3232
dct:created "2019-10-14"^^xsd:date ;
33-
dct:modified "2020-06-24"^^xsd:date ;
34-
owl:versionInfo "3.1.0" ;
35-
owl:versionIRI <https://github.com/IndustrialDataSpace/InformationModel/testing/3.1.0> ;
33+
dct:modified "2020-08-10"^^xsd:date ;
34+
owl:versionInfo "4.0.0" ;
35+
owl:versionIRI <https://github.com/IndustrialDataSpace/InformationModel/testing/4.0.0> ;
3636
vann:preferredNamespaceUri "https://github.com/IndustrialDataSpace/InformationModel/testing/" ;
3737
vann:preferredNamespacePrefix "shapes" ;
3838
rdfs:seeAlso <https://industrialdataspace.github.io/InformationModel/> ;
@@ -78,25 +78,26 @@ shapes:
7878
owl:imports <testing/communication/ParameterGroupShape.ttl> ;
7979
owl:imports <testing/communication/ParameterShape.ttl> ;
8080
owl:imports <testing/content/ArtifactShape.ttl> ;
81+
owl:imports <testing/content/AssetShape.ttl> ;
8182
owl:imports <testing/content/ConceptShape.ttl> ;
8283
owl:imports <testing/content/DataAppShape.ttl> ;
8384
owl:imports <testing/content/DigitalContentShape.ttl> ;
8485
owl:imports <testing/content/MediaTypeShape.ttl> ;
8586
owl:imports <testing/content/RepresentationShape.ttl> ;
8687
owl:imports <testing/content/ResourceShape.ttl> ;
87-
owl:imports <testing/content/VocabularyDataShape.ttl> ;
8888
owl:imports <testing/context/SpatialEntityShape.ttl> ;
8989
owl:imports <testing/context/TemporalEntityShape.ttl> ;
9090
owl:imports <testing/contract/ActionShape.ttl> ;
91+
owl:imports <testing/contract/ConstraintShape.ttl> ;
9192
owl:imports <testing/contract/ContractShape.ttl> ;
92-
owl:imports <testing/contract/PaymentShape.ttl> ;
9393
owl:imports <testing/contract/PricingModelShape.ttl> ;
9494
owl:imports <testing/contract/RuleShape.ttl> ;
9595
owl:imports <testing/governance/CertificationShape.ttl> ;
9696
owl:imports <testing/infrastructure/BrokerShape.ttl> ;
9797
owl:imports <testing/infrastructure/CatalogShape.ttl> ;
9898
owl:imports <testing/infrastructure/ComponentShape.ttl> ;
9999
owl:imports <testing/infrastructure/ConnectorShape.ttl> ;
100+
owl:imports <testing/infrastructure/ParISSHape.ttl> ;
100101
owl:imports <testing/infrastructure/PublicKeyShape.ttl> ;
101102
owl:imports <testing/participant/IndustrialClassificationShape.ttl> ;
102103
owl:imports <testing/participant/ParticipantShape.ttl> ;
@@ -113,6 +114,7 @@ shapes:
113114
owl:imports <testing/taxonomies/MessageShape.ttl> ;
114115
owl:imports <testing/taxonomies/OperationShape.ttl> ;
115116
owl:imports <testing/taxonomies/RepresentationShape.ttl> ;
117+
owl:imports <testing/taxonomies/ResourceShape.ttl> ;
116118
owl:imports <testing/traceability/ActivityShape.ttl> ;
117119
owl:imports <testing/traceability/ManagedEntityShape.ttl> ;
118120
.

‎codes/Action.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ idsc:READ
127127
skos:note "This action is always evaluated at the provider side. It corresponds to 'give access to a resource'."@en ;
128128
.
129129

130-
idsc:TRACKPROVENANCE
130+
idsc:TRACK_PROVENANCE
131131
a ids:Action ;
132132
#odrl:implies ids:acceptTracking;
133133
rdfs:comment "To accept that the use of the Asset may be tracked."@en ;

‎codes/LeftOperand.ttl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@ idsc:SYSTEM a ids:LeftOperand;
117117
rdfs:comment "Execution system or execution environment that is used to access the asset under consideration, usually an IDS Connector. The regarded data object should correspond to the IDS Connector class and its attributes. Must be used together with idsc:SAME_AS, idsc:NOT, idsc:HAS_STATE, idsc:IN, idsc:COVERED_BY idsc:INSIDE, idsc:SPATIAL_EQUALS, idsc:DISJOINT, or idsc:INSIDE_NETWORK operators. RightOperandReference must be a URI identifying the target system(s)."@en ;
118118
.
119119

120-
idsc:ENDPOINT a ids:LeftOperand;
121-
rdfs:label "endpoint" ;
122-
rdfs:comment "Remote target for an action or information provider (PIP). Must be used together with idsc:IS or idsc:IN operators. RightOperand must be a xsd:anyURI or an URL which should point to an actually deployed endpoint. An example is a refinment of idsc:NOTIFY where idsc:REMOTE points to a Clearing House."@en ;
123-
.
124-
125120

126121
# interaction
127122
# -----------

‎create-shacl-ttl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ write_to_file()
88
local version=$1
99

1010
if [[ -z "$version" ]] ; then
11-
version="3.1.0"
11+
version="4.0.0"
1212
echo "Warning! No version parameter supplied. Assuming version ${version}" >&2
1313
fi
1414

‎examples/DATA1.ttl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ data1:
3737

3838
# Communication
3939
ids:resourceEndpoint [
40-
a ids:ResourceEndpoint ;
40+
a ids:ConnectorEndpoint ;
4141
ids:accessURL "https://connector.aastat.gov.de/reports/Highway_accident_statistics.pdf"^^xsd:anyURI ;
4242
] ;
4343
ids:resourceEndpoint [
44-
a ids:ResourceEndpoint ;
44+
a ids:ConnectorEndpoint ;
4545
ids:accessURL "https://connector.aastat.gov.de/reports/Highway_accident_statistics.doc"^^xsd:anyURI ;
4646
] ;
4747

@@ -51,14 +51,14 @@ data1:
5151
# Identifiable materialization(s) - no blank nodes
5252
data1:report_pdf
5353
a ids:Artifact ;
54-
ids:byteSize "1923497"^^xsd:nonNegativeInteger ;
54+
ids:byteSize "1923497"^^xsd:integer ;
5555
ids:fileName "Highway_accident_statistics.pdf" ;
5656
ids:creationDate "2018-06-18T12:00:00.000+02:00"^^xsd:dateTimeStamp ;
5757
.
5858

5959
data1:report_doc
6060
a ids:Artifact ;
61-
ids:byteSize "28923491"^^xsd:nonNegativeInteger ;
61+
ids:byteSize "28923491"^^xsd:integer ;
6262
ids:fileName "Highway_accident_statistics.doc" ;
6363
ids:creationDate "2018-06-18T12:00:00.000+02:00"^^xsd:dateTimeStamp ;
6464
.

‎examples/DATA2.ttl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ data2: a ids:Resource ;
3434
# ids:compression idsc_pack:GZIP ;
3535
] ;
3636
ids:resourceEndpoint [
37-
a ids:ResourceEndpoint ;
37+
a ids:ConnectorEndpoint ;
3838
ids:accessURL "https://connector.aastat.gov.de/resource/archive/EuropeanHighwayStatistics_2000_2017.tar.gz"^^xsd:anyURI ;
3939
] ;
4040
.
4141

4242
data2:tar_gzip_archive # Overall resource archive
4343
a ids:Artifact ;
44-
ids:byteSize "2123178072"^^xsd:nonNegativeInteger ;
44+
ids:byteSize "2123178072"^^xsd:integer ;
4545
ids:fileName "EuropeanHighwayStatistics_2000_2017.tar.gz" ;
4646
ids:creationDate "2018-10-01T12:00:00.000+02:00"^^xsd:dateTimeStamp ;
4747
.
@@ -78,21 +78,21 @@ data2:generic_content
7878
# Enumeration of individual parametrized content instances
7979
data2:E1_20000101
8080
a ids:Artifact ;
81-
ids:byteSize "9823132"^^xsd:nonNegativeInteger ;
81+
ids:byteSize "9823132"^^xsd:integer ;
8282
ids:fileName "E1_20000101.csv" ;
8383
.
8484

8585
# ...
8686

8787
data2:E421_20171231
8888
a ids:Artifact;
89-
ids:byteSize "6174035"^^xsd:nonNegativeInteger ;
89+
ids:byteSize "6174035"^^xsd:integer ;
9090
ids:fileName "E421_20171231.csv" ;
9191
.
9292

9393
data2:
9494
ids:resourceEndpoint [
95-
a ids:ResourceEndpoint ;
95+
a ids:ConnectorEndpoint ;
9696
ids:accessURL "https://connector.aastat.gov.de/resource/content/E1_20000101.csv"^^xsd:anyURI ;
9797
] ;
9898
ids:contractOffer [

‎examples/TEXT_RESOURCE.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"representation": [{
4747
"@type": "ids:TextRepresentation",
4848
"mediaType": {
49-
"@type": "ids:MediaType",
49+
"@type": "ids:IANAMediaType",
5050
"@id": "https://www.iana.org/assignments/media-types/application/pdf"
5151
},
5252
"instance": [{
@@ -64,7 +64,7 @@
6464
}
6565
],
6666
"resourceEndpoint": {
67-
"@type": "ids:ResourceEndpoint",
67+
"@type": "ids:ConnectorEndpoint",
6868
"accessURL": {"@id": "https://connector.fit.fraunhofer.de/augtogen/artifact/934e-112fe8aa050b/reports/Highway_accident_statistics.pdf"}
6969
},
7070

‎examples/TEXT_RESOURCE.ttl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ data1:
8484
# Identifiable materialization(s) - no blank nodes
8585
data1:report_pdf
8686
a ids:Artifact ;
87-
ids:byteSize "1923497"^^xsd:nonNegativeInteger ;
87+
ids:byteSize "1923497"^^xsd:integer ;
8888
ids:fileName "Highway_accident_statistics.pdf" ;
8989
ids:creationDate "2018-12-15T13:20:00Z"^^xsd:dateTimeStamp; ;
9090
.
9191

9292
data1:report_doc
9393
a ids:Artifact ;
94-
ids:byteSize "28923491"^^xsd:nonNegativeInteger ;
94+
ids:byteSize "28923491"^^xsd:integer ;
9595
ids:fileName "Highway_accident_statistics.doc" ;
9696
ids:creationDate "2018-12-15T13:20:00Z"^^xsd:dateTimeStamp; ;
9797
.
@@ -128,14 +128,14 @@ _:contractReource a ids:TextResource;
128128

129129
_:foo
130130
a ids:Artifact ;
131-
ids:byteSize "1923497"^^xsd:nonNegativeInteger ;
131+
ids:byteSize "1923497"^^xsd:integer ;
132132
ids:fileName "Highway_accident_statistics.pdf" ;
133133
ids:creationDate "2018-12-15T13:20:00Z"^^xsd:dateTimeStamp; ;
134134
.
135135

136136
_:bar
137137
a ids:Artifact ;
138-
ids:byteSize "28923491"^^xsd:nonNegativeInteger ;
138+
ids:byteSize "28923491"^^xsd:integer ;
139139
ids:fileName "Highway_accident_statistics.doc" ;
140140
ids:creationDate "2018-12-15T13:20:00Z"^^xsd:dateTimeStamp; ;
141141
.

‎examples/domain-specific-semantics-using-SHACL/TEMP_RESOURCE.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ sample_Data:
105105
# A sample file in JSON format, which contains temperature data.
106106
sample_Data:tempdata_file
107107
a ids:Artifact ;
108-
ids:byteSize "12497"^^xsd:nonNegativeInteger ;
108+
ids:byteSize "12497"^^xsd:integer ;
109109
ids:fileName "Temperature_data.json";
110110
ids:creationDate "2018-06-01"^^xsd:date ;
111111
.

0 commit comments

Comments
 (0)