Merge pull request #255 from International-Data-Spaces-Association/develop

Last minute changes for 3.1.0

Author: Sebastian Bader

CHANGELOG.md

@@ -11,6 +11,7 @@ Version 3.1.0 of the IDS Information model
 ### Added
 
 * `ids:created` and `ids:modified` properties with range `xsd:dateTimeStamp` for `ids:Resource` and `ids:Representation`
+* `ids:hasEndpoint` property for `ids:Connector` with range `ids:Endpoint`
 
 
 ### Fixed

README.md

@@ -3,7 +3,7 @@
 The Information Model is an RDFS/OWL-ontology covering the fundamental concepts of the [International Data Spaces](https://www.internationaldataspaces.org) (IDS), i.e. the types of *digital contents* that are exchanged by *participants* by means of the IDS *infrastructure components*. The ontology and its documentation are published at [https://w3id.org/idsa/core](https://w3id.org/idsa/core). The model development is led by the [Fraunhofer Institutes for Applied Information Technology FIT](https://www.fit.fraunhofer.de/en) and [Intelligent Analysis and Information Systems IAIS](https://www.iais.fraunhofer.de/en) with support by members of the [International Data Spaces Association](https://www.internationaldataspaces.org/) in the context of the *Information Model* sub-working group (SWG4). The group is chaired by [Christoph Lange](https://github.com/clange/) ([Fraunhofer FIT](https://www.fit.fraunhofer.de/)) and [Sebastian Tramp](https://sebastian.tramp.name) ([eccenca GmbH](https://www.eccenca.com)). 
 
 The model development is based on [GitHub](https://github.com/International-Data-Spaces-Association/InformationModel), following a [defined branching model](CONTRIBUTING.md). Contributions and community feedback are maintained via the GitHub [ticketing system](images/Issue_Lifecycle.jpg). The [release process](images/Release_process.jpg) is aligned with the International Data Spaces Association architecture
-working group meetings, i.e. there are roughly 2 releases scheduled per year with intermediary updates to the development branch. The current stable version is *3.0.0*. The Information Model and associated resources published on GitHub are available under the [Apache License 2.0](https://github.com/International-Data-Spaces-Association/InformationModel/blob/master/LICENSE).
+working group meetings, i.e. there are roughly 2 releases scheduled per year with intermediary updates to the development branch. The current release version is *3.0.0*, with the latest revision *3.1.0*. The Information Model and associated resources published on GitHub are available under the [Apache License 2.0](https://github.com/International-Data-Spaces-Association/InformationModel/blob/master/LICENSE).
 
 ## Authors and contributors
 

create-ontology-ttl.sh

@@ -58,7 +58,7 @@ ids:
     dct:created "2017-09-26"^^xsd:date ;
     dct:modified "$(date +%Y-%m-%d)"^^xsd:date ;
     owl:versionInfo "${version}" ;
-    owl:versionIRI "https://w3id.org/idsa/core/${version}>" ;
+    owl:versionIRI <https://w3id.org/idsa/core/${version}> ;
     vann:preferredNamespaceUri "https://w3id.org/idsa/core/" ;
     vann:preferredNamespacePrefix "ids" ;
     rdfs:seeAlso <https://industrialdataspace.github.io/InformationModel/> ;
@@ -113,8 +113,6 @@ _:AnnaKasprzik a dct:Agent, foaf:Person ;
 .
 EOF
 
-    # "open the file to edit" ... not required. echo will do
-
     # search for files in selected folders
     echo '# ----------------------------' >> "$file"
     echo '# Imports of class files' >> "$file"
@@ -133,7 +131,7 @@ EOF
     done
 
     echo ". " >> "$file"
- }
+}
 
 # execute it
 write_to_file $1

model/content/Resource.ttl

@@ -64,12 +64,17 @@ ids:resourceInterface
     rdfs:range ids:Interface;
     rdfs:comment "Reference to the Interface defining Operations supported by the Resource."@en.
 
+# see also ids:hasEndpoint Property also for ids:Connector
 ids:resourceEndpoint
     a owl:ObjectProperty;
     rdfs:label "resource endpoint"@en;
-    rdfs:domain ids:Resource;
+    rdfs:domain ids:Resource ;
+    #[ # todo for IM 4.0.0
+    #            rdf:type owl:Class ;
+    #            owl:unionOf ( ids:Resource ids:Connector )
+    #          ] ;
     rdfs:range ids:Endpoint;
-    rdfs:comment "Reference to the Endpoints serving the resource's content."@en.
+    rdfs:comment "Reference to the Endpoints serving the resource's content or let you exchange messages with an IDS Connector."@en.
 
 ids:standardLicense
     a owl:ObjectProperty ;

model/infrastructure/Connector.ttl

@@ -24,6 +24,10 @@ ids:Connector
         idsm:forProperty ids:host;
         idsm:relationType idsm:OneToMany;
     ]; 
+    idsm:validation [
+        idsm:forProperty ids:hasEndpoint;
+        idsm:relationType idsm:OneToMany;
+    ];
     idsm:validation [
         idsm:forProperty ids:transportCertsSha256;
         idsm:relationType idsm:OneToMany;
@@ -68,6 +72,18 @@ ids:defaultHost
     rdfs:range ids:Host;
     rdfs:comment "Indicates the default host that should be used for basic infrastructure interactions, e.g., providing the self description."@en.
 
+# see also ids:hasEndpoint Property also for ids:Resource
+ids:hasEndpoint
+    a owl:ObjectProperty;
+    rdfs:label "connector endpoint"@en ;
+    rdfs:domain ids:Connector ;
+    #[ # todo for IM 4.0.0
+    #            rdf:type owl:Class ;
+    #            owl:unionOf ( ids:Resource ids:Connector )
+    #          ] ;
+    rdfs:range ids:Endpoint;
+    rdfs:comment "Reference to the Endpoints serving the resource's content or let you exchange messages with an IDS Connector."@en.
+
 ids:securityProfile a owl:ObjectProperty;
     rdfs:domain [ rdf:type owl:Class ;
                 owl:unionOf ( ids:Connector ids:JwtPayload)

testing/infrastructure/ConnectorShape.ttl

@@ -107,5 +107,14 @@ shapes:ConnectorShape
 		sh:maxCount 1 ;
 		sh:severity sh:Violation ;
 		sh:message "<https://raw.githubusercontent.com/IndustrialDataSpace/InformationModel/master/testing/infrastructure/ConnectorShape.ttl> (ConnectorShape): An ids:Connector must have exactly one ids:Catalog linked through the ids:catalog property"@en ; 
-	] .
+	] ;
+
+	sh:property [
+		a sh:PropertyShape ;
+		sh:path ids:hasEndpoint ;
+		sh:class ids:Endpoint ;
+		sh:severity sh:Violation ;
+		sh:message "<https://raw.githubusercontent.com/IndustrialDataSpace/InformationModel/master/testing/infrastructure/ConnectorShape.ttl> (ConnectorShape): An ids:Connector can have an ids:Enpoint linked through the ids:hasEndpoint property."@en ; 
+	] ;
+.