merge develop into master

CHANGELOG.md

@@ -3,6 +3,20 @@ 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/).
 
+## [2.0.1] 2019-11-15
+Version 2.0.1 of the IDS Information model
+
+### Changed
+* Removed property *ids:baseContractOffer* from class *ids:ContractRequestMessage* due to redundancy. Per definition *ids:ContractRequestMessage* already requires a contract in it's payload. The property is therefore not needed.
+
+### Fixed
+* Changed *ids:referingConnector* (class *ids:Token*) from *owl:ObjectProperty* to owl:DatatypeProperty with *rdfs:range xsd:anyURI*. Allows to reference the connector via an URI.
+
+* Removed *idsm:abstract true* proeprty from *ids:variant* (class *ids:Resource*). Property is invalid, since it is intended to be used by classes only. 
+
+* Minor typo fixes.
+
+
 ## [2.0.0] 2019-10-14
 Version 2.0 of the IDS Information model
 
@@ -16,19 +30,19 @@ Version 2.0 of the IDS Information model
 
 ### Changed
  * Connector is now subClass of InfrastructureComponent (Broker, ParIS, DAPS, IP, AppStore)
- 
- * ids:SecurityProfile is now used for pre-defined security profiles. Removed ids:CustomSecurityProfile. 
+
+ * ids:SecurityProfile is now used for pre-defined security profiles. Removed ids:CustomSecurityProfile.
 
  * Messages: Additional classes / properties for the ids:Message taxonomy to further specify and distinguish different message types
      * Update of notification messages related to (un-)availability and changes of a component or its certification
      * ids:QueryMessage now uses codes for message targets (e.g., BROKER, APPSTORE, ANY) and scopes (ALL, ACTIVE_ONLY, INACTIVE_ONLY)
      * New class ids:ContractSupplementMessage to exchange information to access a resource of a contract
      * New class ids:LogNotification, which is intended for logging messages
 
- * Policies: LeftOperand, Operator more restrictive.  Additional operands and operators for different constraint types. 
+ * Policies: LeftOperand, Operator more restrictive.  Additional operands and operators for different constraint types.
 
  * Reduced namespace: ids_ for core model classes / properties, idsc_ for codes and idsm_ for metamodel classes / properties
- 
+
 ### Removed
 
 - Removing plural forms for properties: A catalog can have can have several “ids:offer” triples but must not have any with “ids:offer*s*”

Ontology.ttl

@@ -27,11 +27,13 @@ ids:
     dct:contributor _:AndreasMueller ;
     dct:contributor _:AnnaKasprzik ;
     dct:contributor <https://github.com/sebbader> ;
+    dct:contributor <https://github.com/Madmatti/> ;
+    dct:contributor <https://github.com/HaydarAk> ;
     dct:publisher ids:IDSA ;
     dct:created "2017-09-26"^^xsd:date;
-    dct:modified "2019-10-14"^^xsd:date;
-    owl:versionInfo "2.0.0";
-    owl:versionIRI "https://w3id.org/idsa/core/2.0.0>";
+    dct:modified "2019-11-07"^^xsd:date;
+    owl:versionInfo "2.0.1";
+    owl:versionIRI "https://w3id.org/idsa/core/2.0.1>";
     vann:preferredNamespaceUri "https://w3id.org/idsa/core/";
     vann:preferredNamespacePrefix "ids" ;
     rdfs:seeAlso <https://industrialdataspace.github.io/InformationModel/> ;
@@ -81,6 +83,12 @@ _:AnnaKasprzik a dct:Agent, foaf:Person ;
 <https://github.com/sebbader> a dct:Agent, foaf:Person ;
     foaf:name "Sebastian Bader";
 .
+<https://github.com/HaydarAk> a dct:Agent, foaf:Person ;
+    foaf:name "Haydar Akyürek";
+.
+<https://github.com/Madmatti> a dct:Agent, foaf:Person ;
+    foaf:name "Matthias Böckmann";
+.
 # ----------------------------
 # Imports of class files
 ids:

README.md

@@ -79,4 +79,4 @@ For automated validation of the Information Model POJOs (via the builder classes
 
 For members of the International Data Spaces Association only:
 - Working [document](https://industrialdataspace.jiveon.com/docs/DOC-1817), explaining
-the usage of the Information Model for data exchanges in the IDS.
+the usage of the Information Model for data exchanges in the IDS.

create-ontology-ttl.sh

@@ -8,8 +8,8 @@ write_to_file()
 	 local version=$1
 
 	 if [ -z "$version" ] ; then
-		echo "Warning! No version parameter supplied. Assuming version 1.0.3"
-		version="1.0.3"
+		echo "Warning! No version parameter supplied. Assuming version 2.0.1"
+		version="2.0.1"
 	 fi
 
 
@@ -46,6 +46,8 @@ write_to_file()
 	echo '    dct:contributor _:AndreasMueller ;' >> "$file"
 	echo '    dct:contributor _:AnnaKasprzik ;' >> "$file"
 	echo '    dct:contributor <https://github.com/sebbader> ;' >> "$file"
+	echo '    dct:contributor <https://github.com/Madmatti/> ;' >> "$file"
+	echo '    dct:contributor <https://github.com/HaydarAk> ;' >> "$file"
 	echo '    dct:publisher ids:IDSA ;' >> "$file"
 	echo '    dct:created "2017-09-26"^^xsd:date;' >> "$file"
 	echo '    dct:modified "'$(date +%Y-%m-%d)'"^^xsd:date;' >> "$file"
@@ -100,6 +102,12 @@ write_to_file()
 	echo '<https://github.com/sebbader> a dct:Agent, foaf:Person ;' >> "$file"
 	echo '    foaf:name "Sebastian Bader";' >> "$file"
 	echo '.' >> "$file"
+	echo '<https://github.com/HaydarAk> a dct:Agent, foaf:Person ;' >> "$file"
+	echo '    foaf:name "Haydar Akyürek";' >> "$file"
+	echo '.' >> "$file"
+	echo '<https://github.com/Madmatti> a dct:Agent, foaf:Person ;' >> "$file"
+	echo '    foaf:name "Matthias Böckmann";' >> "$file"
+	echo '.' >> "$file"
 
 	# "open the file to edit" ... not required. echo will do
 

model/content/Resource.ttl

@@ -111,15 +111,14 @@ ids:sovereign
     rdfs:comment "The 'owner', i.e. sovereign of the data."@en.
 
 ids:sample a owl:ObjectProperty;
-    # dicuss: rdfs:subPropertyOf and range
+    # discuss: rdfs:subPropertyOf and range
     rdfs:label "sample"@en;
     rdfs:domain ids:Resource;
     rdfs:range ids:Resource;# Web-retrievable or inline content
     rdfs:comment "Sample Resource instance."@en.
 
 ids:variant a owl:ObjectProperty;
-    # dicuss: rdfs:subPropertyOf adms:translation or ..?
-    idsm:abstract true ;
+    # discuss: rdfs:subPropertyOf adms:translation or ..?
     rdfs:label "variant"@en;
     rdfs:domain ids:Resource;
     rdfs:range ids:Resource;

model/participant/Participant.ttl

@@ -53,7 +53,7 @@ ids:Person rdfs:subClassOf foaf:Person;
     ].
 
 ids:Site a owl:Class;
-    rdfs:subclassOf org:Site;
+    rdfs:subClassOf org:Site;
     rdfs:label "Site"@en;
     rdfs:comment "An office or other premise at which the organization is located"@en.
 

model/security/Token.ttl

@@ -60,11 +60,11 @@ ids:TokenFormat a owl:Class;
 
 
 
-ids:referingConnector a owl:ObjectProperty;
+ids:referingConnector a owl:DatatypeProperty;
     rdfs:label "referingConnector"@en;
     rdfs:domain ids:Token;
-    rdfs:range ids:Connector ; # xsd:base64Binary;
-    rdfs:comment "The RDF connector entity as referred to by the DAT. Must contain at least one SecurityProfile claim."@en.
+    rdfs:range xsd:anyURI ; # xsd:base64Binary;
+    rdfs:comment "The RDF connector entity as referred to by the DAT. The value MUST be its accessible URI. Must contain at least one SecurityProfile claim."@en.
 
 ids:aud a owl:DatatypeProperty;
     rdfs:label "aud"@en;

taxonomies/Message.ttl

@@ -212,17 +212,7 @@ ids:ContractRequestMessage a owl:Class ;
     rdfs:subClassOf ids:RequestMessage ;
     rdfs:label "Contract Request Message"@en;
     rdfs:comment "Message containing a suggested content contract (as offered by the data consumer to the data provider) in the associated payload (which is an instance of ContractRequest)."@en;
-    idsm:validation [
-        idsm:forProperty ids:baseContractOffer;
-        idsm:constraint idsm:NotNull;
-    ].
-
-ids:baseContractOffer a owl:ObjectProperty;
-    rdfs:label "Base Contract Offer"@en ;
-    idsm:referenceByUri true;
-    rdfs:domain ids:ContractRequestMessage;
-    rdfs:range ids:ContractOffer;
-    rdfs:comment "The basic offered contract that the contract request message refers to."@en.
+    .
 
 ids:ContractOfferMessage a owl:Class ;
     rdfs:subClassOf ids:NotificationMessage, ids:ResponseMessage ;
@@ -280,7 +270,7 @@ ids:ResourceNotificationMessage a owl:Class;
     rdfs:label "Resource Notification Message"@en ;
     rdfs:comment "Superclass of all messages, indicating a change of a resource."@en;
 	idsm:validation [
-        idsm:forProperty ids:availableResource;
+        idsm:forProperty ids:affectedResource;
         idsm:constraint idsm:NotNull;
     ].