Merge 4.1.0 from develop to master

International-Data-Spaces-Association · Jun 21, 2021 · ecc415e · ecc415e
2 parents d3a9a1a + a611f47
commit ecc415e
Show file tree

Hide file tree

Showing 356 changed files with 104,190 additions and 79,395 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## [4.1.0] 2021-05-26
+Version 4.1.0 of the IDS Information Model
+
+### Added
+
+* `ids:ConfigurationManager` can refer to the configured App Resources, Brokers, App Stores and Clearing Houses represented as catalogs.
+* `ids:AppRoute` can refer to Broker and Clearing House instances (via `ids:appRouteClearingHouse` and `ids:appRouteBroker`), which are used for publishing and logging related communication.
+* `ids:GenericEndpoint` for non-IDS endpoints.
+* Catalog subclasses for Broker, AppStore, AppResource and ClearingHouse instances. Check the [Catalog.ttl](model/infrastructure/Catalog.ttl) class for details.
+* Additional properties for Participants for identification and classification, e.g., legal name, business identifier, legal form and VAT ID (addressing requirements to participants in Gaia-X)
+* Additional properties for `ids:DataApp` and `ids:AppRepresentation` to express supported usage policies as well as app-related runtime, configuration and deployment information.
+
+### Changed:
+* `ids:ParticipantRequestMessage` and `ids:ParticipantResponseMessage` are deprecated and will be removed in the next release. Using `ids:DescriptionRequestMessage` and `ids:DescriptionReponseMessage` is advised.
+
+
+### Removed
+* `idsm:` metamodel annotations, which were used to annotate cardinalities of properties. The property cardinalities and restrictions are now exclusively represented via the corresponding SHACL shapes found in the [testing subdirectory](testing/)
+
+
 ## [4.0.0] 2020-08-04
 Version 4.0.0 of the IDS Information Model
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,13 +39,13 @@ The format of the commit message should be:
 
 ```
 <subject>
- 
+
 <body>
- 
+
 <footer>
 ```
 
-Where 
+Where
 - subject is a short summary of changes
 - body includes motivation for the change and contrasts with previous behavior
 - footer referencing issues, breaking changes etc.
@@ -54,16 +54,16 @@ Here is an example
 
 ```
 a short (50 chars or less) summary of changes
- 
+
 Body of the commit message, a more detailed explanatory text, if necessary.
 Wrap it to about 72 characters or so. In some contexts, the first
 line is treated as the subject of an email and the rest of the text
 as the body. The blank line separating the summary from the body is
 critical (unless you omit the body entirely); tools like rebase
 can get confused if you run the two together.
- 
+
 Further paragraphs come after blank lines.
- 
+
 - Bullet points are okay, too
 - a hyphen is used for the bullet, preceded by a single space, with blank lines in between
 ```
@@ -130,9 +130,14 @@ This enables the power of the `git describe --always --dirty` command, which out
     - Always merge your feature branch into develop using git merge --no-ff
     - BEWARE: Do not execute git config --global --add merge.ff false! Once you have this parameter as a default, it will provoke merge commits even when updating a branch (pull).
 
+### LTS branches
+  - The Long-Term-Support version of the Information Model should be provided on a separate `LTS` branch.  
+  - LTS version may only be changed via pull requests, which contain only bugfixes.
+
 #### Bugfix Branches
 
 - Same procedure as with feature branches. The only difference is the naming policy: `bugfix/bugfixName` (where bugfix name is some descriptive name for the fixed problem, 2 words most, camel case)
+- It should be checked beforehand, if the bugfix affects both Information Model versions (Normal / LTS).
 
 #### Release Branches
 
@@ -151,4 +156,3 @@ This enables the power of the `git describe --always --dirty` command, which out
     - git tag -s vX.Y.Z+1-pre
 - Note: After creating tags, you need to upload them, as well as the changed branches
     - git push --tags; git push origin master; git push origin develop
-
diff --git a/FAQ for Infomodel.md b/FAQ for Infomodel.md
@@ -0,0 +1,4 @@
+# Frequently asked questions (FAQ) about the InformationModel.
+
+### 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,12 +37,12 @@ ids:
        <https://github.com/mkollenstart> ;
     dct:publisher ids:IDSA ;
     dct:created "2017-09-26"^^xsd:date ;
-    dct:modified "2020-08-10"^^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://industrialdataspace.github.io/InformationModel/> ;
+    rdfs:seeAlso <https://international-data-spaces-association.github.io/InformationModel/> ;
     void:vocabulary
        vann: ,
        void: ,
@@ -132,6 +132,7 @@ ids:
     owl:imports <model/contract/Contract.ttl> ;
     owl:imports <model/contract/LeftOperand.ttl> ;
     owl:imports <model/contract/Rule.ttl> ;
+    owl:imports <model/contract/UsagePolicyClass.ttl> ;
     owl:imports <model/governance/Certification.ttl> ;
     owl:imports <model/governance/License.ttl> ;
     owl:imports <model/infrastructure/AppStore.ttl> ;
@@ -145,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> ;
@@ -158,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> ;
@@ -187,4 +186,5 @@ ids:
     owl:imports <codes/RequestTemplate.ttl> ;
     owl:imports <codes/SecurityGuarantee.ttl> ;
     owl:imports <codes/TokenFormat.ttl> ;
+    owl:imports <codes/UsagePolicyClass.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 *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).
+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
 
@@ -21,6 +21,7 @@ with significant contributions, comments and support by (in alphabetical order):
 - Dr. Sandra Geisler, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
 - Dr. Anna Kasprzik, [TIB](https://www.tib.eu/en)
 - Dr. Christoph Lange, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en) (see above)
+- Jörg Langkau, [nicos AG](http://www.nicos-ag.com)
 - Johannes Lipp, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
 - Andreas W. Müller, [Schaeffler](https://www.schaeffler.de/content.schaeffler.de/en/)
 - Dr. Michael Theß, [Signal Cruncher GmbH](https://signal-cruncher.com/)
@@ -39,8 +40,8 @@ There are following top-level files and directories:
 - `model`: Core model split into sub-model directories each serving a particular modeling aspect.
 - `references`: Versioned sources of relevant 3rd party models used as a reference (informative or effective, i.e. via concept import)
 - `taxonomies`: Hierarchical arrangement of concepts (classes) extending a base concept defined by the core `model`.
-- `testing`: Test resources (e.g. [SHACL](https://www.w3.org/TR/shacl/) shapes and [RDFUnit](http://aksw.org/Projects/RDFUnit.html) test cases), used by tools and the build process to ensure the syntactic validity and semantic consistence of the Information Model
-- `utils`: Utility scripts used for Information Model development and testing
+- `testing`: Test resources (e.g. RDFUnit) used by tools and the build process to ensure the syntactic validity and semantic consistence of the Information Model
+- `utils` : Utility scripts used for Information Model development and testing
 - `views`: Individual tailored views defined upon the overall model for a particular purpose, e.g. the selection of Glossary terms
 - `Ontology.ttl`: Top-level metadata of the Information Model.
 

diff --git a/Shacl.ttl b/Shacl.ttl
@@ -11,7 +11,7 @@
 @prefix cc:   <http://creativecommons.org/ns#> .
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#>.
 @prefix sh: <http://www.w3.org/ns/shacl#> .
-@prefix shapes: <https://github.com/IndustrialDataSpace/InformationModel/testing/> .
+@prefix shapes: <https://github.com/International-Data-Spaces-Association/InformationModel/tree/master/testing> .
 
 # Description of this ontology module
 # ----------------------------
@@ -30,12 +30,12 @@ shapes:
        <https://github.com/HaydarAk> ;
     dct:publisher ids:IDSA ;
     dct:created "2019-10-14"^^xsd:date ;
-    dct:modified "2020-08-10"^^xsd:date ;
-    owl:versionInfo "4.0.0" ;
-    owl:versionIRI <https://github.com/IndustrialDataSpace/InformationModel/testing/4.0.0> ;
-    vann:preferredNamespaceUri "https://github.com/IndustrialDataSpace/InformationModel/testing/" ;
+    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://industrialdataspace.github.io/InformationModel/> ;
+    rdfs:seeAlso <https://international-data-spaces-association.github.io/InformationModel/> ;
     void:vocabulary
        sh: ,
        xsd: ,
@@ -67,43 +67,49 @@ ids:IDSA
 # Imports of class files
 shapes:
     owl:imports <testing/communication/ApiDocumentTypeShape.ttl> ;
+    owl:imports <testing/communication/AppRouteShape.ttl> ;
     owl:imports <testing/communication/EndpointShape.ttl> ;
     owl:imports <testing/communication/HostShape.ttl> ;
     owl:imports <testing/communication/InterfaceShape.ttl> ;
     owl:imports <testing/communication/MessageExchangePatternShape.ttl> ;
     owl:imports <testing/communication/MessageShape.ttl> ;
     owl:imports <testing/communication/OperationBindingShape.ttl> ;
-    owl:imports <testing/communication/OperationShape.ttl> ;
     owl:imports <testing/communication/ParameterAssignmentShape.ttl> ;
     owl:imports <testing/communication/ParameterGroupShape.ttl> ;
     owl:imports <testing/communication/ParameterShape.ttl> ;
+    owl:imports <testing/communication/ProxyShape.ttl> ;
     owl:imports <testing/content/ArtifactShape.ttl> ;
     owl:imports <testing/content/AssetShape.ttl> ;
     owl:imports <testing/content/ConceptShape.ttl> ;
     owl:imports <testing/content/DataAppShape.ttl> ;
-    owl:imports <testing/content/DigitalContentShape.ttl> ;
     owl:imports <testing/content/MediaTypeShape.ttl> ;
     owl:imports <testing/content/RepresentationShape.ttl> ;
     owl:imports <testing/content/ResourceShape.ttl> ;
+    owl:imports <testing/content/UsageControlObjectShape.ttl> ;
     owl:imports <testing/context/SpatialEntityShape.ttl> ;
     owl:imports <testing/context/TemporalEntityShape.ttl> ;
     owl:imports <testing/contract/ActionShape.ttl> ;
     owl:imports <testing/contract/ConstraintShape.ttl> ;
     owl:imports <testing/contract/ContractShape.ttl> ;
+    owl:imports <testing/contract/LeftOperandShape.ttl> ;
     owl:imports <testing/contract/PricingModelShape.ttl> ;
     owl:imports <testing/contract/RuleShape.ttl> ;
     owl:imports <testing/governance/CertificationShape.ttl> ;
     owl:imports <testing/infrastructure/BrokerShape.ttl> ;
     owl:imports <testing/infrastructure/CatalogShape.ttl> ;
     owl:imports <testing/infrastructure/ComponentShape.ttl> ;
+    owl:imports <testing/infrastructure/ConfigurationModelShape.ttl> ;
     owl:imports <testing/infrastructure/ConnectorShape.ttl> ;
+    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> ;
     owl:imports <testing/security/SecurityProfileShape.ttl> ;
     owl:imports <testing/security/TokenShape.ttl> ;
+    owl:imports <testing/security/UserAuthentificationShape.ttl> ;
     owl:imports <testing/shacl/abox-shapes.ttl> ;
     owl:imports <testing/shacl/tbox-shapes.ttl> ;
     owl:imports <testing/shared/DescribedSemanticallyShape.ttl> ;

diff --git a/codes/Action.ttl b/codes/Action.ttl
@@ -4,7 +4,7 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix ids: <https://w3id.org/idsa/core/> .
 @prefix idsc: <https://w3id.org/idsa/code/> .
-@prefix idsm: <https://w3id.org/idsa/metamodel/> .
+
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix odrl: <http://www.w3.org/ns/odrl/2/> .
 

diff --git a/codes/AppEndpointType.ttl b/codes/AppEndpointType.ttl
@@ -32,4 +32,16 @@ idsc:PROCESS_ENDPOINT
     a ids:AppEndpointType;
     rdfs:label "Process endpoint"@en ;
     rdfs:comment "Endpoint is used to start (or control) app processing."@en ;
+.
+
+idsc:USAGE_POLICY_ENDPOINT
+    a ids:AppEndpointType;
+    rdfs:label "Usage policy endpoint"@en ;
+    rdfs:comment "Endpoint is used for usage policy / usage control related scenarios."@en ;
+.
+
+idsc:SELF_DESCRIPTION_ENDPOINT
+    a ids:AppEndpointType;
+    rdfs:label "Self-description endpoint"@en ;
+    rdfs:comment "Pre-defined endpoint used to return the corresponding self-description of the data app."@en ;
 .
diff --git a/codes/ArtifactState.ttl b/codes/ArtifactState.ttl
@@ -10,7 +10,7 @@
 @prefix org: <http://www.w3.org/ns/org#> .
 @prefix ids: <https://w3id.org/idsa/core/> .
 @prefix idsc: <https://w3id.org/idsa/code/> .
-@prefix idsm: <https://w3id.org/idsa/metamodel/> .
+
 
 
 # Instances

diff --git a/codes/BinaryOperators.ttl b/codes/BinaryOperators.ttl
@@ -10,7 +10,7 @@
 @prefix org: <http://www.w3.org/ns/org#> .
 @prefix ids: <https://w3id.org/idsa/core/> .
 @prefix idsc: <https://w3id.org/idsa/code/> .
-@prefix idsm: <https://w3id.org/idsa/metamodel/> .
+
 
 
 # Instances

diff --git a/codes/CertificationLevel.ttl b/codes/CertificationLevel.ttl
@@ -4,7 +4,7 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix ids: <https://w3id.org/idsa/core/> .
 @prefix idsc: <https://w3id.org/idsa/code/> .
-@prefix idsm: <https://w3id.org/idsa/metamodel/> .
+
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 
 

diff --git a/codes/ContentType.ttl b/codes/ContentType.ttl
@@ -2,7 +2,7 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix dct: <http://purl.org/dc/terms/> .
 @prefix ids: <https://w3id.org/idsa/core/> .
-@prefix idsm: <https://w3id.org/idsa/metamodel/> .
+
 @prefix idsc: <https://w3id.org/idsa/code/> .
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 
@@ -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/KeyType.ttl b/codes/KeyType.ttl
@@ -4,7 +4,7 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix ids: <https://w3id.org/idsa/core/> .
 @prefix idsc: <https://w3id.org/idsa/code/> .
-@prefix idsm: <https://w3id.org/idsa/metamodel/> .
+
 
 # Instances
 # ---------