Merge pull request #460 from International-Data-Spaces-Association/fi…

…x/minor_fixes_for_4.1.0 Fix/minor fixes for 4.1.0
International-Data-Spaces-Association · Jun 21, 2021 · a611f47 · a611f47
2 parents 22d8582 + 2ab88da
commit a611f47
Show file tree

Hide file tree

Showing 65 changed files with 74 additions and 708 deletions.
diff --git a/FAQ for Infomodel.md b/FAQ for Infomodel.md
@@ -1,14 +1,4 @@
 # Frequently asked questions (FAQ) about the InformationModel.
 
-
-## FAQ	
-## Question 1?
-Answer.
-
-
-## Question 2?
-Answer.
-
-
-## Question 3?
-Answer.
+### What is the relationship of the IDS Information Model to the Gaia-X Federated Secure Data Infrastructure?
+Like in the IDS, a key principle of Gaia-X is that participants in an ecosystem and the services they provide describe themselves with machine-comprehensible, standardized metadata. The information model used for that, the so-called Gaia-X Self-Description Schema, has a lot in common with the IDS Information Model, especially when describing concepts that IDS and Gaia-X have in common, e.g., participants, data resources (called “data assets” in Gaia-X), or data apps (related to Gaia-X services). In fact, we are working closely with the Gaia-X community to keep both ontologies aligned.
diff --git a/NOTES.md b/NOTES.md
diff --git a/Ontology.ttl b/Ontology.ttl
@@ -37,9 +37,9 @@ ids:
        <https://github.com/mkollenstart> ;
     dct:publisher ids:IDSA ;
     dct:created "2017-09-26"^^xsd:date ;
-    dct:modified "2021-03-26"^^xsd:date ;
-    owl:versionInfo "4.0.0" ;
-    owl:versionIRI <https://w3id.org/idsa/core/4.0.0> ;
+    dct:modified "2021-06-17"^^xsd:date ;
+    owl:versionInfo "4.1.0" ;
+    owl:versionIRI <https://w3id.org/idsa/core/4.1.0> ;
     vann:preferredNamespaceUri "https://w3id.org/idsa/core/" ;
     vann:preferredNamespacePrefix "ids" ;
     rdfs:seeAlso <https://international-data-spaces-association.github.io/InformationModel/> ;
@@ -146,6 +146,7 @@ ids:
     owl:imports <model/infrastructure/InfrastructureComponent.ttl> ;
     owl:imports <model/infrastructure/ParIS.ttl> ;
     owl:imports <model/infrastructure/PublicKey.ttl> ;
+    owl:imports <model/participant/BusinessIdentifier.ttl> ;
     owl:imports <model/participant/Participant.ttl> ;
     owl:imports <model/security/AuthInfo.ttl> ;
     owl:imports <model/security/AuthStandard.ttl> ;
@@ -159,9 +160,6 @@ ids:
     owl:imports <model/traceability/ConnectorStatus.ttl> ;
     owl:imports <model/traceability/LogLevel.ttl> ;
     owl:imports <model/traceability/ManagedEntity.ttl> ;
-    owl:imports <metamodel/Annotation.ttl> ;
-    owl:imports <metamodel/Validation.ttl> ;
-    owl:imports <metamodel/View.ttl> ;
     owl:imports <taxonomies/Certification.ttl> ;
     owl:imports <taxonomies/Contract.ttl> ;
     owl:imports <taxonomies/Message.ttl> ;

diff --git a/README.md b/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 release version is *4.0.0*, with the latest revision *4.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 *4.1.0*, with the latest revision *4.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
 

diff --git a/Shacl.ttl b/Shacl.ttl
@@ -30,9 +30,9 @@ shapes:
        <https://github.com/HaydarAk> ;
     dct:publisher ids:IDSA ;
     dct:created "2019-10-14"^^xsd:date ;
-    dct:modified "2021-03-26"^^xsd:date ;
-    owl:versionInfo "4.0.0" ;
-    owl:versionIRI <https://github.com/International-Data-Spaces-Association/InformationModel/tree/master/testing/4.0.0> ;
+    dct:modified "2021-06-17"^^xsd:date ;
+    owl:versionInfo "4.1.0" ;
+    owl:versionIRI <https://github.com/International-Data-Spaces-Association/InformationModel/tree/master/testing/4.1.0> ;
     vann:preferredNamespaceUri "https://github.com/International-Data-Spaces-Association/InformationModel/tree/master/testing" ;
     vann:preferredNamespacePrefix "shapes" ;
     rdfs:seeAlso <https://international-data-spaces-association.github.io/InformationModel/> ;
@@ -103,6 +103,7 @@ shapes:
     owl:imports <testing/infrastructure/InfrastructureComponentShape.ttl> ;
     owl:imports <testing/infrastructure/ParISSHape.ttl> ;
     owl:imports <testing/infrastructure/PublicKeyShape.ttl> ;
+    owl:imports <testing/participant/BusinessIdentifierShape.ttl> ;
     owl:imports <testing/participant/IndustrialClassificationShape.ttl> ;
     owl:imports <testing/participant/ParticipantShape.ttl> ;
     owl:imports <testing/security/AuthInfoShape.ttl> ;

diff --git a/codes/ContentType.ttl b/codes/ContentType.ttl
@@ -12,10 +12,10 @@
 idsc:INTERFACE_DEFINITION
     a ids:ContentType;
     rdfs:label "Interface definition";
-    rdfs:comment "Formal, machine-interpretable definition of a protocol-specific API, e.g. OpenAPI, GraphQL, API Blueprint, WSDL."@en .
+    rdfs:comment "Formal, machine-interpretable definition of a protocol-specific API, e.g., OpenAPI, GraphQL, API Blueprint, WSDL."@en .
 
 idsc:SCHEMA_DEFINITION
     a ids:ContentType;
     rdfs:label "Schema definition";
-    rdfs:comment "Formal, machine-interpretable definition of a data schema, e.g. XMLSchema, JSONSchema"@en .
+    rdfs:comment "Formal, machine-interpretable definition of a data schema, e.g., XMLSchema, JSONSchema"@en .
 
diff --git a/codes/SecurityGuarantee.ttl b/codes/SecurityGuarantee.ttl
@@ -211,7 +211,6 @@ idsc:TRUST_SECURITY_PROFILE
     a ids:SecurityProfile;
     rdfs:label "Trust security profile"@en;
     rdfs:comment "The Security Profile TRUST as defined by the IDS certification criteria."@en;
-    #ids:parentSecurityProfile idsc:BASE_SECURITY_PROFILE;
     ids:securityGuarantee idsc:INTEGRITY_VERIFICATION_REMOTE;
     ids:securityGuarantee idsc:AUTHENTICATION_MUTUAL;
     ids:securityGuarantee idsc:SERVICE_ISOLATION_LEAST_PRIVILEGE;

diff --git a/create-ontology-ttl.sh b/create-ontology-ttl.sh
@@ -8,8 +8,11 @@ write_to_file()
     local version=$1
 
     if [[ -z "$version" ]] ; then
-        version="4.0.0"
-        echo "Warning! No version parameter supplied. Assuming version ${version}" >&2
+        echo Warning! No version parameter supplied. >&2
+		echo Add version parameter to script. >&2
+		echo Example: $'\n\t'sh create-ontology-ttl.sh 4.1.0 $'\n'>&2
+		echo Exiting >&2
+		exit 1;
     fi
 
 
@@ -136,7 +139,6 @@ EOF
     # search for files in selected folders (omitting metamodel/)
     for class in $(find \
                        model/* \
-                       metamodel/ \
                        taxonomies/ \
                        codes/ \
                        -maxdepth 1 -name "*.ttl")

diff --git a/create-shacl-ttl.sh b/create-shacl-ttl.sh
@@ -8,8 +8,11 @@ write_to_file()
     local version=$1
 
     if [[ -z "$version" ]] ; then
-        version="4.0.0"
-        echo "Warning! No version parameter supplied. Assuming version ${version}" >&2
+        echo Warning! No version parameter supplied. >&2
+		echo Add version parameter to script. >&2
+		echo Example: $'\n\t'sh create-shacl-ttl.sh 4.1.0 $'\n'>&2
+		echo Exiting >&2
+		exit 1;
     fi
 
 

diff --git a/examples/APPSTORE.jsonld b/examples/APPSTORE.jsonld
@@ -49,8 +49,8 @@
       "ids:maintainer": {
         "@id": "http://fit.fraunhofer.de/participant/foo"
       },
-      "ids:inboundModelVersion": "4.0.0",
-      "ids:outboundModelVersion": "4.0.0",
+      "ids:inboundModelVersion": "4.1.0",
+      "ids:outboundModelVersion": "4.1.0",
       "ids:resourceCatalog": {
         "@id": "_:ub61bL21C25"
       },

diff --git a/examples/APPSTORE.ttl b/examples/APPSTORE.ttl
@@ -9,8 +9,8 @@
     ids:description "IDS AppStore self-description" ;
     ids:maintainer <http://fit.fraunhofer.de/participant/foo> ;
     ids:curator <http://fit.fraunhofer.de/participant/bar> ;
-    ids:outboundModelVersion "4.0.0" ;
-	ids:inboundModelVersion "4.0.0" ;
+    ids:outboundModelVersion "4.1.0" ;
+	ids:inboundModelVersion "4.1.0" ;
     ids:securityProfile idsc:BASE_SECURITY_PROFILE;
     ids:hasDefaultEndpoint [
       a ids:ConnectorEndpoint;

diff --git a/examples/APP_RESOURCE.ttl b/examples/APP_RESOURCE.ttl
@@ -27,7 +27,7 @@
             a ids:SmartDataApp ;
             ids:appDocumentation "App-related human-readable documentation.";
             ids:appEnvironmentVariables "$Env1 = environment variable 1, $Env2 = environment variable 2";
-            ids:appStorageConfiguration "1 Docker volume required, e.g. -v /data";
+            ids:appStorageConfiguration "1 Docker volume required, e.g., -v /data";
             ids:appEndpoint [
                 a ids:AppEndpoint;
                 ids:appEndpointInformation "I am an app endpoint. I do endpoint things.";

diff --git a/examples/BROKER.jsonld b/examples/BROKER.jsonld
@@ -41,11 +41,11 @@
       "ids:hasDefaultEndpoint": {
         "@id": "_:ub91bL19C28"
       },
-      "ids:inboundModelVersion": "4.0.0",
+      "ids:inboundModelVersion": "4.1.0",
       "ids:maintainer": {
         "@id": "https://im.internationaldataspaces.org/participant/part1"
       },
-      "ids:outboundModelVersion": "4.0.0",
+      "ids:outboundModelVersion": "4.1.0",
       "ids:physicalLocation": {
         "@id": "http://sws.geonames.org/3247450/"
       },

diff --git a/examples/BROKER.ttl b/examples/BROKER.ttl
@@ -15,8 +15,8 @@ broker1:
     ids:maintainer part1: ; # Participant ~ service provider PART1
     ids:curator part1: ; # Content manager
     ids:physicalLocation <http://sws.geonames.org/3247450/> ; #Datacenter located in Bonn
-    ids:outboundModelVersion "4.0.0" ;
-    ids:inboundModelVersion "4.0.0" ;
+    ids:outboundModelVersion "4.1.0" ;
+    ids:inboundModelVersion "4.1.0" ;
 
     ids:hasDefaultEndpoint [
                a ids:ConnectorEndpoint;

diff --git a/examples/CONNECTOR_1.jsonld b/examples/CONNECTOR_1.jsonld
@@ -25,11 +25,11 @@
       "ids:hasDefaultEndpoint": {
         "@id": "conn1:http_host"
       },
-      "ids:inboundModelVersion": "4.0.0",
+      "ids:inboundModelVersion": "4.1.0",
       "ids:maintainer": {
         "@id": "https://im.internationaldataspaces.org/participant/part1"
       },
-      "ids:outboundModelVersion": "4.0.0",
+      "ids:outboundModelVersion": "4.1.0",
       "ids:physicalLocation": {
         "@id": "http://sws.geonames.org/3247450/"
       },

diff --git a/examples/CONNECTOR_1.ttl b/examples/CONNECTOR_1.ttl
@@ -16,8 +16,8 @@ conn1:
     ids:maintainer part1: ;
     ids:curator part1: ;
     ids:physicalLocation <http://sws.geonames.org/3247450/> ; # Bonn
-    ids:outboundModelVersion "4.0.0" ;
-    ids:inboundModelVersion "4.0.0" ;
+    ids:outboundModelVersion "4.1.0" ;
+    ids:inboundModelVersion "4.1.0" ;
 
     # Network hosts maintained by the Connector
     ids:hasDefaultEndpoint conn1:http_host ;

diff --git a/examples/CONNECTOR_2.ttl b/examples/CONNECTOR_2.ttl
@@ -17,8 +17,8 @@ conn2:
     ids:maintainer part1: ; # Participant ~ service provider PART1
     ids:curator part1: ; # Content manager
     ids:physicalLocation <http://sws.geonames.org/3247450/> ; #Datacenter located in Bonn
-    ids:outboundModelVersion "4.0.0" ;
-    ids:inboundModelVersion "4.0.0" ;
+    ids:outboundModelVersion "4.1.0" ;
+    ids:inboundModelVersion "4.1.0" ;
     ids:hasDefaultEndpoint conn2:http_host;
     # Security and trust features
     ids:authInfo conn2:auth_info ;

diff --git a/examples/CONNECTOR_UPDATE_MESSAGE.jsonld b/examples/CONNECTOR_UPDATE_MESSAGE.jsonld
@@ -28,7 +28,7 @@
       "ids:issuerConnector": {
         "@id": "https://aastat.gov.de/connector/conn2/"
       },
-      "ids:modelVersion": "4.0.0",
+      "ids:modelVersion": "4.1.0",
       "ids:recipientConnector": {
         "@id": "https://aastat.gov.de/broker/broker1/"
       },

diff --git a/examples/CONNECTOR_UPDATE_MESSAGE.ttl b/examples/CONNECTOR_UPDATE_MESSAGE.ttl
@@ -9,7 +9,7 @@
     ids:issuerConnector <https://aastat.gov.de/connector/conn2/> ;
     ids:recipientConnector <https://aastat.gov.de/broker/broker1/> ;
     ids:issued "2020-06-08T12:10:13Z"^^xsd:dateTimeStamp ;
-    ids:modelVersion "4.0.0" ;
+    ids:modelVersion "4.1.0" ;
 	ids:affectedConnector <https://aastat.gov.de/connector/conn2/> ;
 	ids:senderAgent <https://astaat.gov.de/connector/senderAgent> ;
     ids:securityToken [ 

diff --git a/examples/CONTRACT_MESSAGES.ttl b/examples/CONTRACT_MESSAGES.ttl
@@ -13,7 +13,7 @@ conn3:inter3_r a ids:ContractRequestMessage;
     ids:issuerConnector conn3: ;
     ids:recipientConnector conn2: ;
     ids:issued "2020-06-08T12:10:13Z"^^xsd:dateTimeStamp ;
-    ids:modelVersion "4.0.0";
+    ids:modelVersion "4.1.0";
     ids:securityToken [ 
 		a ids:DynamicAttributeToken ;
 		ids:tokenFormat idsc:JWT ;
@@ -27,7 +27,7 @@ conn2:inter3_o a ids:ContractOfferMessage;
     ids:issuerConnector conn2: ;
     ids:recipientConnector conn3: ;
     ids:issued "2020-06-08T12:10:13Z"^^xsd:dateTimeStamp ;
-    ids:modelVersion "4.0.0";
+    ids:modelVersion "4.1.0";
     ids:securityToken [ 
 		a ids:DynamicAttributeToken ;
 		ids:tokenFormat idsc:JWT ;
@@ -42,7 +42,7 @@ conn3:inter3_a a ids:ContractAgreementMessage;
     ids:issuerConnector conn3: ;
     ids:recipientConnector conn2: ;
     ids:issued "2020-06-08T12:10:13Z"^^xsd:dateTimeStamp ;
-    ids:modelVersion "4.0.0";
+    ids:modelVersion "4.1.0";
     ids:securityToken [ 
 		a ids:DynamicAttributeToken ;
 		ids:tokenFormat idsc:JWT ;
@@ -57,7 +57,7 @@ conn2:inter3_a a ids:ContractAgreementMessage;
     ids:issuerConnector conn2: ;
     ids:recipientConnector conn3: ;
     ids:issued "2020-06-08T12:10:13Z"^^xsd:dateTimeStamp ;
-    ids:modelVersion "4.0.0";
+    ids:modelVersion "4.1.0";
     ids:securityToken [ 
 		a ids:DynamicAttributeToken ;
 		ids:tokenFormat idsc:JWT ;

diff --git a/examples/PARTICIPANT_1.ttl b/examples/PARTICIPANT_1.ttl
@@ -12,7 +12,7 @@ part1:
     ids:description "Agency maintaining a large-scale infrastructure for monitoring, analysis and prediction of highway utilization statistics in Europe."@en ;
     ids:corporateEmailAddress "[email protected]" ;
     ids:corporateHomepage <http://aastat.de> ;
-    ids:legalForm "DX6Z" ; # see ELF-Code and ISO-20275 
+    ids:legalForm "DX6Z" ; # see ELF-Code and ISO-20275. <https://www.gleif.org/en/about-lei/code-lists/iso-20275-entity-legal-forms-code-list/>
     ids:primarySite [
         a ids:Site ;
         ids:siteAddress "Agentur für Autobahnstatistik, Am Hügel 5, D-53121 Bonn" ;

diff --git a/examples/PARTICIPANT_2.ttl b/examples/PARTICIPANT_2.ttl
@@ -9,7 +9,7 @@ part2:
     ids:description "Software development and service provision"@en ;
     ids:corporateEmailAddress "[email protected]" ;
     ids:corporateHomepage <http://app4traffic.de> ;
-    ids:legalForm "DX6Z" ; # see ELF-Code and ISO-20275 
+    ids:legalForm "DX6Z" ; # see ELF-Code and ISO-20275. <https://www.gleif.org/en/about-lei/code-lists/iso-20275-entity-legal-forms-code-list/>
 	ids:primarySite [
         a ids:Site ;
         ids:siteAddress "App4Traffic GmbH, Am Rheinufer 7, D-53127 Bonn" ;

diff --git a/examples/PARTICIPANT_3.ttl b/examples/PARTICIPANT_3.ttl
@@ -9,7 +9,7 @@ part3:
     ids:description "Interational logistics company"@en ;
     ids:corporateEmailAddress "[email protected]" ;
     ids:corporateHomepage <http://www.supercargo.de> ;
-    ids:legalForm "DX6Z" ; # see ELF-Code and ISO-20275 
+    ids:legalForm "DX6Z" ; # see ELF-Code and ISO-20275. <https://www.gleif.org/en/about-lei/code-lists/iso-20275-entity-legal-forms-code-list/>
 	ids:primarySite [
         a ids:Site ;
         ids:siteAddress "Supercargo Gmbh, Musterstraße 5, Köln, Deutschland" ;

diff --git a/examples/QUERY_MESSAGE.ttl b/examples/QUERY_MESSAGE.ttl
@@ -15,7 +15,7 @@
     ids:issuerConnector conn2: ;
     ids:recipientConnector broker1: ;
     ids:issued "2020-08-06T15:57:00Z"^^xsd:dateTimeStamp;
-    ids:modelVersion "4.0.0";
+    ids:modelVersion "4.1.0";
 	ids:senderAgent conn2:senderAgent ;
     ids:securityToken [ 
 		a ids:DynamicAttributeToken ;

diff --git a/examples/RESULT_MESSAGE.ttl b/examples/RESULT_MESSAGE.ttl
@@ -16,7 +16,7 @@
     ids:recipientConnector :conn2 ;
     ids:issued "2020-08-06T15:57:01Z"^^xsd:dateTimeStamp;
 	ids:senderAgent broker1:senderAgent ;
-    ids:modelVersion "4.0.0";
+    ids:modelVersion "4.1.0";
 	ids:securityToken [ 
 		a ids:DynamicAttributeToken ;
 		ids:tokenFormat idsc:JWT ;

diff --git a/examples/TEXT_RESOURCE.ttl b/examples/TEXT_RESOURCE.ttl
@@ -19,7 +19,7 @@ data1:
     # Reference to a existing Resource included, definition of "part-whole" hierarchies.
     # ids:resourcePart <https://example.org/resources/anotherResource>;
 
-    # Variant of a resource, e.g. translated version
+    # Variant of a resource, e.g., translated version
     # ids:variant <https://example.org/resources/variantResource>;
 
     # Temporal period covered by the content of the resource:     2000-01-01 to 2017-12-31
@@ -47,7 +47,7 @@ data1:
     # Language of resource:         Englisch
     ids:language idsc:EN ;
 
-    # sample of the resource, e.g. web-retrievable or inline content
+    # sample of the resource, e.g., web-retrievable or inline content
     # ids:sample <another ids:Resource>;
 
     # Representation of resource:

diff --git a/examples/TRUSTED_CONNECTOR.jsonld b/examples/TRUSTED_CONNECTOR.jsonld
@@ -19,8 +19,8 @@
     } ],
   "ids:maintainer" : {"@id": "https://www.fit.fraunhofer.de"},
   "ids:curator" :  {"@id": "https://www.fit.fraunhofer.de"},
-  "ids:inboundModelVersion" : "4.0.0",
-  "ids:outboundModelVersion" : "4.0.0",
+  "ids:inboundModelVersion" : "4.1.0",
+  "ids:outboundModelVersion" : "4.1.0",
   "ids:authInfo" : [{
     "@type" : "ids:AuthInfo",
     "ids:authService" : {