Feature/bindings for dataapps

Ontology.ttl

@@ -37,7 +37,7 @@ ids:
        <https://github.com/mkollenstart> ;
     dct:publisher ids:IDSA ;
     dct:created "2017-09-26"^^xsd:date ;
-    dct:modified "2021-06-17"^^xsd:date ;
+    dct:modified "2021-06-28"^^xsd:date ;
     owl:versionInfo "4.1.0" ;
     owl:versionIRI <https://w3id.org/idsa/core/4.1.0> ;
     vann:preferredNamespaceUri "https://w3id.org/idsa/core/" ;
@@ -107,16 +107,21 @@ _:AnnaKasprzik a dct:Agent, foaf:Person ;
 # ----------------------------
 # Imports of class files
 ids:
+    owl:imports <model/communication/AppEndpointType.ttl> ;
     owl:imports <model/communication/AppRoute.ttl> ;
     owl:imports <model/communication/Endpoint.ttl> ;
+    owl:imports <model/communication/EndpointBinding.ttl> ;
+    owl:imports <model/communication/EndpointReference.ttl> ;
     owl:imports <model/communication/Message.ttl> ;
+    owl:imports <model/communication/ProtocolType.ttl> ;
     owl:imports <model/communication/Proxy.ttl> ;
+    owl:imports <model/content/App.ttl> ;
+    owl:imports <model/content/AppType.ttl> ;
     owl:imports <model/content/Artifact.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/DataApp.ttl> ;
     owl:imports <model/content/DigitalContent.ttl> ;
     owl:imports <model/content/Language.ttl> ;
     owl:imports <model/content/MediaType.ttl> ;
@@ -167,6 +172,7 @@ ids:
     owl:imports <taxonomies/Resource.ttl> ;
     owl:imports <codes/Action.ttl> ;
     owl:imports <codes/AppEndpointType.ttl> ;
+    owl:imports <codes/AppType.ttl> ;
     owl:imports <codes/ArtifactState.ttl> ;
     owl:imports <codes/Audience.ttl> ;
     owl:imports <codes/BinaryOperators.ttl> ;
@@ -179,6 +185,7 @@ ids:
     owl:imports <codes/Language.ttl> ;
     owl:imports <codes/LeftOperand.ttl> ;
     owl:imports <codes/LogLevel.ttl> ;
+    owl:imports <codes/ProtocolType.ttl> ;
     owl:imports <codes/QueryLanguage.ttl> ;
     owl:imports <codes/QueryScope.ttl> ;
     owl:imports <codes/QueryTarget.ttl> ;

Shacl.ttl

@@ -30,7 +30,7 @@ shapes:
        <https://github.com/HaydarAk> ;
     dct:publisher ids:IDSA ;
     dct:created "2019-10-14"^^xsd:date ;
-    dct:modified "2021-06-17"^^xsd:date ;
+    dct:modified "2021-06-28"^^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" ;
@@ -68,6 +68,8 @@ ids:IDSA
 shapes:
     owl:imports <testing/communication/ApiDocumentTypeShape.ttl> ;
     owl:imports <testing/communication/AppRouteShape.ttl> ;
+    owl:imports <testing/communication/EndpointBindingShape.ttl> ;
+    owl:imports <testing/communication/EndpointReferenceShape.ttl> ;
     owl:imports <testing/communication/EndpointShape.ttl> ;
     owl:imports <testing/communication/HostShape.ttl> ;
     owl:imports <testing/communication/InterfaceShape.ttl> ;
@@ -78,10 +80,10 @@ shapes:
     owl:imports <testing/communication/ParameterGroupShape.ttl> ;
     owl:imports <testing/communication/ParameterShape.ttl> ;
     owl:imports <testing/communication/ProxyShape.ttl> ;
+    owl:imports <testing/content/AppShape.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/MediaTypeShape.ttl> ;
     owl:imports <testing/content/RepresentationShape.ttl> ;
     owl:imports <testing/content/ResourceShape.ttl> ;

codes/AppType.ttl

@@ -0,0 +1,22 @@
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ids: <https://w3id.org/idsa/core/> .
+@prefix idsc: <https://w3id.org/idsa/code/> .
+
+# Instances
+# ---------
+
+idsc:SMART_DATA_APP
+    a ids:AppType;
+    rdfs:label "Smart data app";
+    rdfs:comment "Smart data apps are executing any kind of necessary data processing or transformation."@en .
+
+idsc:ORCHESTRATION_APP
+    a ids:AppType;
+    rdfs:label "Orchestration app";
+    rdfs:comment "Apps for orchestrating other apps, inside a Connector."@en .
+
+ids:SYSTEM_ADAPTER_APP
+    a ids:AppType;
+    rdfs:label "System adapter App"@en;
+    rdfs:comment "Data Apps that integrate sources and sinks of digital content maintained internally on Participant's premises with a Connector."@en.

codes/ProtocolType.ttl

@@ -0,0 +1,15 @@
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ids: <https://w3id.org/idsa/core/> .
+@prefix idsc: <https://w3id.org/idsa/code/> .
+
+
+idsc:HTTP
+    a ids:ProtocolType;
+    rdfs:label "HTTP"@en ;
+.
+
+idsc:MQTT
+    a ids:ProtocolType;
+    rdfs:label "MQTT"@en ;
+.

docs/serializations/ontology.ttl

@@ -426,8 +426,8 @@ xsd:duration rdf:type rdfs:Datatype .
                                                rdfs:range <https://w3id.org/idsa/core/Connector> .
 
 
-###  https://w3id.org/idsa/core/affectedDataApp
-<https://w3id.org/idsa/core/affectedDataApp> rdf:type owl:ObjectProperty ;
+###  https://w3id.org/idsa/core/affectedApp
+<https://w3id.org/idsa/core/affectedApp> rdf:type owl:ObjectProperty ;
                                              rdfs:domain <https://w3id.org/idsa/core/AppRegistrationRequestMessage> ;
                                              rdfs:range <https://w3id.org/idsa/core/AppResource> .
 
@@ -458,7 +458,7 @@ xsd:duration rdf:type rdfs:Datatype .
 
 ###  https://w3id.org/idsa/core/appEndpoint
 <https://w3id.org/idsa/core/appEndpoint> rdf:type owl:ObjectProperty ;
-                                         rdfs:domain <https://w3id.org/idsa/core/DataApp> ;
+                                         rdfs:domain <https://w3id.org/idsa/core/App> ;
                                          rdfs:range <https://w3id.org/idsa/core/AppEndpoint> ;
                                          rdfs:comment "Endpoints of a data app"@en ;
                                          rdfs:label "app endpoint"@en .
@@ -735,7 +735,7 @@ xsd:duration rdf:type rdfs:Datatype .
 ###  https://w3id.org/idsa/core/dataAppInformation
 <https://w3id.org/idsa/core/dataAppInformation> rdf:type owl:ObjectProperty ;
                                                 rdfs:domain <https://w3id.org/idsa/core/AppRepresentation> ;
-                                                rdfs:range <https://w3id.org/idsa/core/DataApp> ;
+                                                rdfs:range <https://w3id.org/idsa/core/App> ;
                                                 rdfs:comment "Information about the concrete data app implementation"@en ;
                                                 rdfs:label "data app information"@en .
 
@@ -1472,7 +1472,7 @@ xsd:duration rdf:type rdfs:Datatype .
 
 ###  https://w3id.org/idsa/core/appDocumentation
 <https://w3id.org/idsa/core/appDocumentation> rdf:type owl:DatatypeProperty ;
-                                              rdfs:domain <https://w3id.org/idsa/core/DataApp> ;
+                                              rdfs:domain <https://w3id.org/idsa/core/App> ;
                                               rdfs:range xsd:string ;
                                               rdfs:comment "text documentation of the data app"@en ;
                                               rdfs:label "app documentation"@en .
@@ -2906,8 +2906,8 @@ owl:Class rdf:type owl:Class .
                                                rdfs:seeAlso <https://tools.ietf.org/html/rfc7519> .
 
 
-###  https://w3id.org/idsa/core/DataApp
-<https://w3id.org/idsa/core/DataApp> rdf:type owl:Class .
+###  https://w3id.org/idsa/core/App
+<https://w3id.org/idsa/core/App> rdf:type owl:Class .
 
 
 ###  https://w3id.org/idsa/core/DataRepresentation
@@ -3392,7 +3392,7 @@ owl:Class rdf:type owl:Class .
 
 ###  https://w3id.org/idsa/core/OrchestrationApp
 <https://w3id.org/idsa/core/OrchestrationApp> rdf:type owl:Class ;
-                                              rdfs:subClassOf <https://w3id.org/idsa/core/DataApp> ;
+                                              rdfs:subClassOf <https://w3id.org/idsa/core/App> ;
                                               rdfs:comment "Apps for orchestrating System Adapter Apps or Smart Data Apps, inside a Connector."@en ;
                                               rdfs:label "Orchestration App"@en .
 
@@ -3755,11 +3755,11 @@ owl:Class rdf:type owl:Class .
                                   rdfs:label "Site"@en .
 
 
-###  https://w3id.org/idsa/core/SmartDataApp
-<https://w3id.org/idsa/core/SmartDataApp> rdf:type owl:Class ;
-                                          rdfs:subClassOf <https://w3id.org/idsa/core/DataApp> ;
-                                          rdfs:comment "Smart DataApps are executing any kind of necessary data processing or transformation."@en ;
-                                          rdfs:label "Smart DataApp"@en .
+###  https://w3id.org/idsa/core/SmartApp
+<https://w3id.org/idsa/core/SmartApp> rdf:type owl:Class ;
+                                          rdfs:subClassOf <https://w3id.org/idsa/core/App> ;
+                                          rdfs:comment "Smart Apps are executing any kind of necessary data processing or transformation."@en ;
+                                          rdfs:label "Smart App"@en .
 
 
 ###  https://w3id.org/idsa/core/SoftwareRepresentation
@@ -3820,7 +3820,7 @@ owl:Class rdf:type owl:Class .
 
 ###  https://w3id.org/idsa/core/SystemAdapter
 <https://w3id.org/idsa/core/SystemAdapter> rdf:type owl:Class ;
-                                           rdfs:subClassOf <https://w3id.org/idsa/core/DataApp> ;
+                                           rdfs:subClassOf <https://w3id.org/idsa/core/App> ;
                                            rdfs:comment "Data Apps that integrate sources and sinks of digital content maintained internally on Participant's premises with a Connector."@en ;
                                            rdfs:label "System Adapter"@en .
 
@@ -7724,7 +7724,7 @@ _:genid51 <https://w3id.org/idsa/metamodel/constraint> <https://w3id.org/idsa/me
                                                     <https://w3id.org/idsa/metamodel/abstract> "true"^^xsd:boolean .
 
 _:genid52 <https://w3id.org/idsa/metamodel/constraint> <https://w3id.org/idsa/metamodel/NotNull> ;
-           <https://w3id.org/idsa/metamodel/forProperty> <https://w3id.org/idsa/core/affectedDataAppResource> .
+           <https://w3id.org/idsa/metamodel/forProperty> <https://w3id.org/idsa/core/affectedAppResource> .
 
 
 ###  https://w3id.org/idsa/core/AppRoute
@@ -7958,8 +7958,8 @@ _:genid85 <https://w3id.org/idsa/metamodel/relationType> <https://w3id.org/idsa/
            <https://w3id.org/idsa/metamodel/forProperty> <https://w3id.org/idsa/core/extendedGuarantee> .
 
 
-###  https://w3id.org/idsa/core/DataApp
-<https://w3id.org/idsa/core/DataApp> rdf:type owl:NamedIndividual ;
+###  https://w3id.org/idsa/core/App
+<https://w3id.org/idsa/core/App> rdf:type owl:NamedIndividual ;
                                      <https://w3id.org/idsa/metamodel/validation> _:genid86 ;
                                      <https://w3id.org/idsa/metamodel/abstract> "true"^^xsd:boolean .
 
@@ -8462,8 +8462,8 @@ _:genid161 <https://w3id.org/idsa/metamodel/constraint> <https://w3id.org/idsa/m
                                                <https://w3id.org/idsa/metamodel/referenceByUri> "true"^^xsd:boolean .
 
 
-###  https://w3id.org/idsa/core/affectedDataApp
-<https://w3id.org/idsa/core/affectedDataApp> rdf:type owl:NamedIndividual ;
+###  https://w3id.org/idsa/core/affectedApp
+<https://w3id.org/idsa/core/affectedApp> rdf:type owl:NamedIndividual ;
                                              <https://w3id.org/idsa/metamodel/referenceByUri> "true"^^xsd:boolean .
 
 
@@ -8643,11 +8643,11 @@ _:AnnaKasprzik rdf:type <http://purl.org/dc/terms/Agent> ,
                                     rdfs:label "Action"@en .
 
 
-<https://w3id.org/idsa/core/AppEndpoint> rdfs:comment "Description of endpoints a DataApp offers."@en ;
-                                         rdfs:label "DataApp Endpoint"@en .
+<https://w3id.org/idsa/core/AppEndpoint> rdfs:comment "Description of endpoints a App offers."@en ;
+                                         rdfs:label "App Endpoint"@en .
 
 
-<https://w3id.org/idsa/core/AppNotificationMessage> rdfs:comment "Superclass of all messages, indicating a change of a DataApp. Unlike Resource-related Messages, AppNotificationMessages should lead to a state change for an app at the recipient, the AppStore."@en ;
+<https://w3id.org/idsa/core/AppNotificationMessage> rdfs:comment "Superclass of all messages, indicating a change of a App. Unlike Resource-related Messages, AppNotificationMessages should lead to a state change for an app at the recipient, the AppStore."@en ;
                                                     rdfs:label "App Notification Message"@en .
 
 
@@ -8746,8 +8746,8 @@ _:AnnaKasprzik rdf:type <http://purl.org/dc/terms/Agent> ,
                                         rdfs:seeAlso <https://tools.ietf.org/html/rfc7519> .
 
 
-<https://w3id.org/idsa/core/DataApp> rdfs:comment "Self-contained, self-descriptive software package that is distributed via the App Store and deployed inside a Connector; provides access to data and data processing capa­bilities; the interface of a Data App is semantically described by the IDS Information Model."@en ;
-                                     rdfs:label "DataApp"@en .
+<https://w3id.org/idsa/core/App> rdfs:comment "Self-contained, self-descriptive software package that is distributed via the App Store and deployed inside a Connector; provides access to data and data processing capa­bilities; the interface of a Data App is semantically described by the IDS Information Model."@en ;
+                                     rdfs:label "App"@en .
 
 
 <https://w3id.org/idsa/core/Described> rdfs:comment "Entity described by a minimal textual annotation, i.e. a title and description."@en ;
@@ -8937,7 +8937,7 @@ _:AnnaKasprzik rdf:type <http://purl.org/dc/terms/Agent> ,
                                                rdfs:label "affected Connector"@en .
 
 
-<https://w3id.org/idsa/core/affectedDataApp> rdfs:comment "The affected data app that is referenced in the App-related messages. "@en ;
+<https://w3id.org/idsa/core/affectedApp> rdfs:comment "The affected data app that is referenced in the App-related messages. "@en ;
                                              rdfs:label "affected AppResource"@en .
 
 

examples/APP_RESOURCE.ttl

@@ -3,47 +3,65 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix idsc: <https://w3id.org/idsa/code/> .
 
+
 <https://connector.fit.fraunhofer.de/apps/ImageAnonymizationApp/1337>
     a ids:AppResource;
     ids:title "App Title" ;
     ids:description "Data App for something with data."@en;
     ids:keyword "Data", "processing", "bla" ;
     ids:customLicense <https://www.gnu.org/licenses/gpl-3.0-standalone.html> ;
+
+    # Set by the AppStore as part of the app publication
     ids:resourceEndpoint [
         a ids:ConnectorEndpoint ;
         ids:endpointInformation "This is the default endpoint of the FIT Connector. Used for communication and data exchange.";
         ids:endpointDocumentation <http://someAPIreferenceIRI> ;
-        ids:accessURL <https://connector.fraunhofer.de/httphost> ;
-        ids:endpointArtifact <https://connector.fit.fraunhofer.de/apps/instance/42> ;
-        ids:path "/apps/processor/TrafficImageAnonymization.zip"
+        ids:accessURL <https://connector.fraunhofer.de/httphost/> ;
+        ids:endpointArtifact <https://connector.fit.fraunhofer.de/apps/myApp> ;
     ];
 
-    ids:representation [
+    ids:defaultRepresentation [
         a ids:AppRepresentation ;
         ids:mediaType <https://www.iana.org/assignments/media-types/application/zip> ;
-        ids:dataAppDistributionService <https://example.com> ;
-        ids:dataAppRuntimeEnvironment "Docker" ;
-        ids:dataAppInformation [
-            a ids:SmartDataApp ;
+
+        # Set by the AppStore
+        ids:instance <https://connector.fit.fraunhofer.de/apps/myApp> ;
+
+        ids:appRuntimeEnvironment "Docker" ;
+        ids:appInformation [
+			a ids:App ;
+
+            # general app-specific information
+            ids:appType idsc:SMART_DATA_APP;
             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:appEndpoint [
-                a ids:AppEndpoint;
-                ids:appEndpointInformation "I am an app endpoint. I do endpoint things.";
-                ids:appEndpointDocumentation <https://app.swaggerhub.com/apis/app/1337> ;
-                ids:appEndpointType idsc:INPUT_ENDPOINT ;
-                ids:appEndPointPort 5000 ;
-                ids:path "/input";
-                ids:appEndpointMediaType <https://www.iana.org/assignments/media-types/application/json> ;
-                ids:appEndpointProtocol "HTTP/1.1";
-                ]
-            ];
-    ]
+            ids:appContainerSpecReference <http://some-IRI-reference> ;
+
+			# Supprted usage policies of the data app
+            ids:supportedUsagePolicies idsc:ALLOW_DATA_USAGE, idsc:SECURITY_LEVEL_RESTRICTED_POLICY;
+
+			# Endpoint bindings
+			ids:endpointBinding [
+				a ids:EndpointBinding ;
+				ids:apiSpecReference <https://example.org/myOpenAPISpec> ;
+				ids:protocolType idsc:HTTP ;
+				ids:apiSpecVersion "0.1" ;
+
+				# Reference to sections of the API. Contains JSON refs and the corresponding data app endpoint type.
+				ids:endpointReference [
+					a ids:EndpointReference ;
+					ids:value "#/components/schema/input";
+					ids:appEndpointType idsc:INPUT_ENDPOINT ;
+				] ;
+  			];
+  		]
+  	]
 .
 
 <https://www.iana.org/assignments/media-types/application/zip> a ids:IANAMediaType .
 
 <https://www.iana.org/assignments/media-types/application/json>  a ids:IANAMediaType .
 
-<https://connector.fit.fraunhofer.de/apps/instance/42> a ids:Artifact .
+<https://connector.fit.fraunhofer.de/apps/myApp> a ids:Artifact ;
+    ids:fileName "myTemplate";
+    ids:byteSize 420;
+.

model/communication/AppEndpointType.ttl

@@ -0,0 +1,15 @@
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix ids: <https://w3id.org/idsa/core/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+
+# Classes
+# -------
+
+ids:AppEndpointType
+    a owl:Class ;
+    rdfs:label "App endpoint type"@en ;
+    rdfs:comment "Class of endpoint types a data app offers."@en ;
+.