Skip to content

Commit

Permalink
Merge pull request #566 from International-Data-Spaces-Association/ci…
Browse files Browse the repository at this point in the history 
…/december2021

Merge changes from Ci/december2021 back into develop
  • Loading branch information
@PHochmann
PHochmann authored Jun 8, 2022
2 parents b264d42 + 887676a commit 5293315
Show file tree
Hide file tree
Showing 8 changed files with 117 additions and 107 deletions.
19 changes: 17 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,29 @@ 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.2.0] 2021-09-30
Pre-release version 4.2.0 of the IDS Information Model
## [4.2.0] 2022-06-01
Version 4.2.0 of the IDS Information Model

### Added

* Class `ids:PaymentModality` and property `ids:paymentModality` to document pricing modalities (free/ fixed price/ negotiation basis). Property is directly attached to the `ids:Resource`.
* Class `ids:IdsProtocolSpecification` and property `ids:apiSpecification` to describe `ids:Endpoint`s with their supported protocols
* New individuals of `ids:Action`: `ADD`, `DIVIDE`, `HASH`, `INCREMENT_COUNTER`, `MULTIPLY`, `REPLACE`, `SHUFFLE`
* New individuals of `ids:Frequency`: `TWO_TIMES_A_DAY`, `EVERY_THREE_HOURS`, `BIHOURLY`, `HOURLY`, `EVERY_30_MINUTES`, `EVERY_15_MINUTES`, `EVERY_10_MINUTES`, `EVERY_5_MINUTES`, `EVERY_1_MINUTE`
* New individuals of `ids:IdsProtocolSpecification`: `IDS-REST`, `IDS-CP`, `QUERY`, `MULTIPART`
* New individuals of `ids:LeftOperand`: `DATE_TIME`, `HASH_ALGORITHM`, `JSON_PATH`, `XPATH`, `REPLACE_WITH`, `OPERAND`, `ROLE`, `RECIPIENT`, `TARGET_POLICY`, `ARTIFACT_STATE`, `SYSTEM_DEVICE`, `APPLICATION`, `CONNECTOR`, `LOG_LEVEL`, `NOTIFICATION_LEVEL`
* New individuals of `ids:CustomMediaType`: `OTHER_MEDIATYPE`
* Title (`ids:title`) and description (`ids:description`) properties for `ids:Representation`.
* Shapes for AppResources
* Class UsageControlComponent and Shape

### Changed

* `ids:Representation` is now subclass of `ids:Described` giving instances a title- and description label.

### Removed

* Remove `ids:magicNumber` from `ids:MediaType`

## [4.1.0] 2021-05-26
Version 4.1.0 of the IDS Information Model
Expand Down
96 changes: 47 additions & 49 deletions Ontology.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ids:
<https://github.com/lcomet> ;
dct:publisher ids:IDSA ;
dct:created "2017-09-26"^^xsd:date ;
dct:modified "2021-10-07"^^xsd:date ;
dct:modified "2022-06-01"^^xsd:date ;
owl:versionInfo "4.2.0" ;
owl:versionIRI <https://w3id.org/idsa/core/4.2.0> ;
vann:preferredNamespaceUri "https://w3id.org/idsa/core/" ;
Expand Down Expand Up @@ -103,95 +103,93 @@ _:AnnaKasprzik a dct:Agent, foaf:Person ;
foaf:name "Maarten Kollenstart" ;
.
<https://github.com/JohannesLipp> a dct:Agent, foaf:Person ;
foaf:name "Johannes Theissen-Lipp" ;
foaf:name "Johannes Lipp" ;
.
<https://github.com/lcomet> a dct:Agent, foaf:Person ;
foaf:name "Lina Molinas Comet" ;
.
# ----------------------------
# Imports of class files
ids:
owl:imports <model/adms.ttl> ;
owl:imports <model/communication/AppRoute.ttl> ;
owl:imports <model/communication/Endpoint.ttl> ;
owl:imports <model/communication/Message.ttl> ;
owl:imports <model/communication/Proxy.ttl> ;
owl:imports <model/content/Artifact.ttl> ;
owl:imports <model/communication/AppRoute.ttl> ;
owl:imports <model/communication/Endpoint.ttl> ;
owl:imports <model/content/UsageControlObject.ttl> ;
owl:imports <model/content/ArtifactState.ttl> ;
owl:imports <model/content/Asset.ttl> ;
owl:imports <model/content/Concept.ttl> ;
owl:imports <model/content/ContentType.ttl> ;
owl:imports <model/content/Resource.ttl> ;
owl:imports <model/content/Representation.ttl> ;
owl:imports <model/content/Artifact.ttl> ;
owl:imports <model/content/DataApp.ttl> ;
owl:imports <model/content/DigitalContent.ttl> ;
owl:imports <model/content/PaymentModalities.ttl> ;
owl:imports <model/content/Language.ttl> ;
owl:imports <model/content/Asset.ttl> ;
owl:imports <model/content/MediaType.ttl> ;
owl:imports <model/content/PaymentModalities.ttl> ;
owl:imports <model/content/Representation.ttl> ;
owl:imports <model/content/Resource.ttl> ;
owl:imports <model/content/UsageControlObject.ttl> ;
owl:imports <model/context/Event.ttl> ;
owl:imports <model/context/SpatialEntity.ttl> ;
owl:imports <model/content/DigitalContent.ttl> ;
owl:imports <model/context/TemporalEntity.ttl> ;
owl:imports <model/contract/Action.ttl> ;
owl:imports <model/contract/BinaryOperator.ttl> ;
owl:imports <model/context/SpatialEntity.ttl> ;
owl:imports <model/contract/UsageControlComponent.ttl> ;
owl:imports <model/contract/Constraint.ttl> ;
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/contract/BinaryOperator.ttl> ;
owl:imports <model/contract/Action.ttl> ;
owl:imports <model/contract/LeftOperand.ttl> ;
owl:imports <model/contract/Contract.ttl> ;
owl:imports <model/governance/Certification.ttl> ;
owl:imports <model/governance/License.ttl> ;
owl:imports <model/infrastructure/AppStore.ttl> ;
owl:imports <model/infrastructure/Broker.ttl> ;
owl:imports <model/infrastructure/Catalog.ttl> ;
owl:imports <model/infrastructure/ClearingHouse.ttl> ;
owl:imports <model/infrastructure/InfrastructureComponent.ttl> ;
owl:imports <model/infrastructure/DAPS.ttl> ;
owl:imports <model/infrastructure/ConfigurationModel.ttl> ;
owl:imports <model/infrastructure/Connector.ttl> ;
owl:imports <model/infrastructure/DAPS.ttl> ;
owl:imports <model/infrastructure/IdentityProvider.ttl> ;
owl:imports <model/infrastructure/InfrastructureComponent.ttl> ;
owl:imports <model/infrastructure/Catalog.ttl> ;
owl:imports <model/infrastructure/AppStore.ttl> ;
owl:imports <model/infrastructure/ParIS.ttl> ;
owl:imports <model/infrastructure/IdentityProvider.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> ;
owl:imports <model/security/SecurityProfile.ttl> ;
owl:imports <model/participant/BusinessIdentifier.ttl> ;
owl:imports <model/security/Token.ttl> ;
owl:imports <model/security/AuthStandard.ttl> ;
owl:imports <model/security/AuthInfo.ttl> ;
owl:imports <model/security/UserAuthentication.ttl> ;
owl:imports <model/security/SecurityProfile.ttl> ;
owl:imports <model/shared/Described.ttl> ;
owl:imports <model/shared/DescribedSemantically.ttl> ;
owl:imports <model/shared/Named.ttl> ;
owl:imports <model/traceability/ConnectorDeployMode.ttl> ;
owl:imports <model/traceability/ConnectorStatus.ttl> ;
owl:imports <model/traceability/LogLevel.ttl> ;
owl:imports <model/traceability/ConnectorStatus.ttl> ;
owl:imports <model/traceability/ConnectorDeployMode.ttl> ;
owl:imports <model/traceability/ManagedEntity.ttl> ;
owl:imports <taxonomies/Certification.ttl> ;
owl:imports <taxonomies/Contract.ttl> ;
owl:imports <taxonomies/Message.ttl> ;
owl:imports <taxonomies/Representation.ttl> ;
owl:imports <taxonomies/Resource.ttl> ;
owl:imports <codes/Action.ttl> ;
owl:imports <codes/AppEndpointType.ttl> ;
owl:imports <taxonomies/Representation.ttl> ;
owl:imports <taxonomies/Contract.ttl> ;
owl:imports <codes/Frequency.ttl> ;
owl:imports <codes/LogLevel.ttl> ;
owl:imports <codes/ArtifactState.ttl> ;
owl:imports <codes/SecurityGuarantee.ttl> ;
owl:imports <codes/RequestTemplate.ttl> ;
owl:imports <codes/Mediatype.ttl> ;
owl:imports <codes/CertificationLevel.ttl> ;
owl:imports <codes/TokenFormat.ttl> ;
owl:imports <codes/RejectionReason.ttl> ;
owl:imports <codes/Audience.ttl> ;
owl:imports <codes/BinaryOperators.ttl> ;
owl:imports <codes/CertificationLevel.ttl> ;
owl:imports <codes/ConnectorDeployMode.ttl> ;
owl:imports <codes/IdsProtocolSpecification.ttl> ;
owl:imports <codes/ConnectorStatus.ttl> ;
owl:imports <codes/ContentType.ttl> ;
owl:imports <codes/Frequency.ttl> ;
owl:imports <codes/ConnectorDeployMode.ttl> ;
owl:imports <codes/AppEndpointType.ttl> ;
owl:imports <codes/UsagePolicyClass.ttl> ;
owl:imports <codes/Action.ttl> ;
owl:imports <codes/LeftOperand.ttl> ;
owl:imports <codes/QueryLanguage.ttl> ;
owl:imports <codes/KeyType.ttl> ;
owl:imports <codes/Language.ttl> ;
owl:imports <codes/LeftOperand.ttl> ;
owl:imports <codes/LogLevel.ttl> ;
owl:imports <codes/Mediatype.ttl> ;
owl:imports <codes/PaymentModality.ttl> ;
owl:imports <codes/QueryLanguage.ttl> ;
owl:imports <codes/QualityMetrics.ttl> ;
owl:imports <codes/ContentType.ttl> ;
owl:imports <codes/QueryTarget.ttl> ;
owl:imports <codes/RejectionReason.ttl> ;
owl:imports <codes/RequestTemplate.ttl> ;
owl:imports <codes/SecurityGuarantee.ttl> ;
owl:imports <codes/TokenFormat.ttl> ;
owl:imports <codes/UsagePolicyClass.ttl> ;
.
57 changes: 28 additions & 29 deletions Shacl.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ shapes:
<https://github.com/HaydarAk> ;
dct:publisher ids:IDSA ;
dct:created "2019-10-14"^^xsd:date ;
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> ;
dct:modified "2022-06-01"^^xsd:date ;
owl:versionInfo "4.2.0" ;
owl:versionIRI <https://github.com/International-Data-Spaces-Association/InformationModel/tree/master/testing/4.2.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/> ;
Expand Down Expand Up @@ -66,60 +66,59 @@ 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/EndpointShape.ttl> ;
owl:imports <testing/communication/ParameterGroupShape.ttl> ;
owl:imports <testing/communication/ApiDocumentTypeShape.ttl> ;
owl:imports <testing/communication/MessageExchangePatternShape.ttl> ;
owl:imports <testing/communication/MessageShape.ttl> ;
owl:imports <testing/communication/OperationBindingShape.ttl> ;
owl:imports <testing/communication/ParameterGroupShape.ttl> ;
owl:imports <testing/communication/ParameterShape.ttl> ;
owl:imports <testing/communication/OperationBindingShape.ttl> ;
owl:imports <testing/communication/AppRouteShape.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/ArtifactShape.ttl> ;
owl:imports <testing/content/DataAppShape.ttl> ;
owl:imports <testing/content/MediaTypeShape.ttl> ;
owl:imports <testing/content/RepresentationShape.ttl> ;
owl:imports <testing/content/ResourceShape.ttl> ;
owl:imports <testing/content/ConceptShape.ttl> ;
owl:imports <testing/content/MediaTypeShape.ttl> ;
owl:imports <testing/content/UsageControlObjectShape.ttl> ;
owl:imports <testing/content/ResourceShape.ttl> ;
owl:imports <testing/context/SpatialEntityShape.ttl> ;
owl:imports <testing/context/TemporalEntityShape.ttl> ;
owl:imports <testing/contract/ActionShape.ttl> ;
owl:imports <testing/contract/PricingModelShape.ttl> ;
owl:imports <testing/contract/RuleShape.ttl> ;
owl:imports <testing/contract/ConstraintShape.ttl> ;
owl:imports <testing/contract/ContractShape.ttl> ;
owl:imports <testing/contract/ActionShape.ttl> ;
owl:imports <testing/contract/LeftOperandShape.ttl> ;
owl:imports <testing/contract/PricingModelShape.ttl> ;
owl:imports <testing/contract/RuleShape.ttl> ;
owl:imports <testing/contract/UsageControlComponentShape.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/InfrastructureComponentShape.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/ParISShape.ttl> ;
owl:imports <testing/infrastructure/CatalogShape.ttl> ;
owl:imports <testing/infrastructure/PublicKeyShape.ttl> ;
owl:imports <testing/participant/BusinessIdentifierShape.ttl> ;
owl:imports <testing/infrastructure/BrokerShape.ttl> ;
owl:imports <testing/participant/IndustrialClassificationShape.ttl> ;
owl:imports <testing/participant/BusinessIdentifierShape.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/security/TokenShape.ttl> ;
owl:imports <testing/security/SecurityProfileShape.ttl> ;
owl:imports <testing/shacl/tbox-shapes.ttl> ;
owl:imports <testing/shacl/abox-shapes.ttl> ;
owl:imports <testing/shared/DescribedSemanticallyShape.ttl> ;
owl:imports <testing/shared/DescribedShape.ttl> ;
owl:imports <testing/shared/NamedShape.ttl> ;
owl:imports <testing/taxonomies/CertificationShape.ttl> ;
owl:imports <testing/shared/DescribedShape.ttl> ;
owl:imports <testing/taxonomies/DigitalContentShape.ttl> ;
owl:imports <testing/taxonomies/RepresentationShape.ttl> ;
owl:imports <testing/taxonomies/CertificationShape.ttl> ;
owl:imports <testing/taxonomies/MessageShape.ttl> ;
owl:imports <testing/taxonomies/OperationShape.ttl> ;
owl:imports <testing/taxonomies/RepresentationShape.ttl> ;
owl:imports <testing/taxonomies/ResourceShape.ttl> ;
owl:imports <testing/traceability/ActivityShape.ttl> ;
owl:imports <testing/traceability/ManagedEntityShape.ttl> ;
owl:imports <testing/traceability/ActivityShape.ttl> ;
.
2 changes: 0 additions & 2 deletions examples/BROKER.ttl
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
@prefix ids: <https://w3id.org/idsa/core/> .
@prefix idsc: <https://w3id.org/idsa/code/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix idsc: <https://w3id.org/idsa/code/> .
@prefix part1: <https://im.internationaldataspaces.org/participant/part1> .
@prefix conn2: <https://aastat.gov.de/connector/conn2/> .
@prefix broker1: <https://aastat.gov.de/connector/broker1/> .
@prefix dct: <http://purl.org/dc/terms/> .


broker1:
a ids:Broker;
# General properties
Expand Down
11 changes: 0 additions & 11 deletions examples/DAT_PAYLOAD.jsonld
View file

This file was deleted.

2 changes: 1 addition & 1 deletion examples/TEXT_RESOURCE.jsonld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
"xsd": "http://www.w3.org/2001/XMLSchema#",
"time": "http://www.w3.org/2006/time#",
"odrl:" "http://www.w3.org/ns/odrl/2/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dct": "http://purl.org/dc/terms/"
},
"@type": "ids:TextResource",
Expand Down
Loading

0 comments on commit 5293315

Please sign in to comment.