Skip to content

Commit 404d42a

Browse files
namedgraphnamedgraph
committed
Moved types to system.trig
1 parent 578327d commit 404d42a

File tree

8 files changed

+39
-58
lines changed

8 files changed

+39
-58
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ ENV LOAD_DATASETS=
9191

9292
ENV CONTEXT_DATASET_URL=file:///var/linkeddatahub/datasets/dataspaces.trig
9393

94-
ENV SERVICES_DATASET_URL=file:///var/linkeddatahub/datasets/services.trig
94+
ENV SERVICES_DATASET_URL=file:///var/linkeddatahub/datasets/system.trig
9595

9696
ENV ADMIN_DATASET_URL=file:///var/linkeddatahub/datasets/admin.trig
9797

‎config/dataspaces.trig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<urn:linkeddatahub:apps/admin>
1717
{
18-
<urn:linkeddatahub:apps/admin> a lapp:Application, lapp:AdminApplication ;
18+
<urn:linkeddatahub:apps/admin> a lapp:Application ;
1919
dct:title "LinkedDataHub admin" ;
2020
lapp:origin <https://admin.localhost:4443> ;
2121
ldt:ontology <https://w3id.org/atomgraph/linkeddatahub/admin#> ;
@@ -27,7 +27,7 @@
2727

2828
<urn:linkeddatahub:apps/end-user>
2929
{
30-
<urn:linkeddatahub:apps/end-user> a lapp:Application, lapp:EndUserApplication ;
30+
<urn:linkeddatahub:apps/end-user> a lapp:Application ;
3131
dct:title "LinkedDataHub" ;
3232
lapp:origin <https://localhost:4443> ;
3333
ldt:ontology <https://localhost:4443/ns#> ;
@@ -40,7 +40,7 @@
4040

4141
<urn:linkeddatahub:apps/northwind-traders/admin>
4242
{
43-
<urn:linkeddatahub:apps/northwind-traders/admin> a lapp:Application, lapp:AdminApplication ;
43+
<urn:linkeddatahub:apps/northwind-traders/admin> a lapp:Application ;
4444
dct:title "Northwind Traders admin" ;
4545
lapp:origin <https://admin.northwind-traders.demo.localhost:4443> ;
4646
ldt:ontology <https://w3id.org/atomgraph/linkeddatahub/admin#> ;
@@ -52,7 +52,7 @@
5252

5353
<urn:linkeddatahub:apps/northwind-traders/end-user>
5454
{
55-
<urn:linkeddatahub:apps/northwind-traders/end-user> a lapp:Application, lapp:EndUserApplication ;
55+
<urn:linkeddatahub:apps/northwind-traders/end-user> a lapp:Application ;
5656
dct:title "Northwind Traders" ;
5757
lapp:origin <https://northwind-traders.demo.localhost:4443> ;
5858
ldt:ontology <https://northwind-traders.demo.localhost:4443/ns#> ;

config/services.trig renamed to config/system.trig

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
@prefix lapp: <https://w3id.org/atomgraph/linkeddatahub/apps#> .
12
@prefix a: <https://w3id.org/atomgraph/core#> .
23
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
34
@prefix ldt: <https://www.w3.org/ns/ldt#> .
45
@prefix sd: <http://www.w3.org/ns/sparql-service-description#> .
56
@prefix dct: <http://purl.org/dc/terms/> .
67

78
### internal deployment wiring - not for public sharing ###
8-
### maps apps to their backend SPARQL services ###
9+
### maps apps to their backend SPARQL services, and assigns admin/end-user roles ###
910

10-
# root admin - service binding
11+
# root admin - type + service binding
1112

1213
<urn:linkeddatahub:apps/admin>
1314
{
14-
<urn:linkeddatahub:apps/admin> ldt:service <urn:linkeddatahub:services/admin> .
15+
<urn:linkeddatahub:apps/admin> a lapp:AdminApplication ;
16+
ldt:service <urn:linkeddatahub:services/admin> .
1517
}
1618

1719
# root admin - service description
@@ -26,11 +28,12 @@
2628
a:quadStore <http://fuseki-admin:3030/ds/> .
2729
}
2830

29-
# root end-user - service binding
31+
# root end-user - type + service binding
3032

3133
<urn:linkeddatahub:apps/end-user>
3234
{
33-
<urn:linkeddatahub:apps/end-user> ldt:service <urn:linkeddatahub:services/end-user> .
35+
<urn:linkeddatahub:apps/end-user> a lapp:EndUserApplication ;
36+
ldt:service <urn:linkeddatahub:services/end-user> .
3437
}
3538

3639
# root end-user - service description
@@ -45,16 +48,18 @@
4548
a:quadStore <http://fuseki-end-user:3030/ds/> .
4649
}
4750

48-
# northwind-traders admin - service binding (reuses root admin service)
51+
# northwind-traders admin - type + service binding (reuses root admin service)
4952

5053
<urn:linkeddatahub:apps/northwind-traders/admin>
5154
{
52-
<urn:linkeddatahub:apps/northwind-traders/admin> ldt:service <urn:linkeddatahub:services/admin> .
55+
<urn:linkeddatahub:apps/northwind-traders/admin> a lapp:AdminApplication ;
56+
ldt:service <urn:linkeddatahub:services/admin> .
5357
}
5458

55-
# northwind-traders end-user - service binding (reuses root end-user service)
59+
# northwind-traders end-user - type + service binding (reuses root end-user service)
5660

5761
<urn:linkeddatahub:apps/northwind-traders/end-user>
5862
{
59-
<urn:linkeddatahub:apps/northwind-traders/end-user> ldt:service <urn:linkeddatahub:services/end-user> .
63+
<urn:linkeddatahub:apps/northwind-traders/end-user> a lapp:EndUserApplication ;
64+
ldt:service <urn:linkeddatahub:services/end-user> .
6065
}

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ services:
9797
- ./uploads:/var/www/linkeddatahub/uploads
9898
- ./config/dev.log4j.properties:/usr/local/tomcat/webapps/ROOT/WEB-INF/classes/log4j.properties:ro
9999
- ./config/dataspaces.trig:/var/linkeddatahub/datasets/dataspaces.trig
100-
- ./config/services.trig:/var/linkeddatahub/datasets/services.trig
100+
- ./config/system.trig:/var/linkeddatahub/datasets/system.trig
101101
fuseki-admin:
102102
image: atomgraph/fuseki:4.7.0
103103
user: root # otherwise fuseki user does not have permissions to the mounted folder which is owner by root

‎http-tests/config/dataspaces.trig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<urn:linkeddatahub:apps/admin>
1717
{
18-
<urn:linkeddatahub:apps/admin> a lapp:Application, lapp:AdminApplication ;
18+
<urn:linkeddatahub:apps/admin> a lapp:Application ;
1919
dct:title "LinkedDataHub admin" ;
2020
lapp:origin <https://admin.localhost:4443> ;
2121
ldt:ontology <https://w3id.org/atomgraph/linkeddatahub/admin#> ;
@@ -26,7 +26,7 @@
2626

2727
<urn:linkeddatahub:apps/end-user>
2828
{
29-
<urn:linkeddatahub:apps/end-user> a lapp:Application, lapp:EndUserApplication ;
29+
<urn:linkeddatahub:apps/end-user> a lapp:Application ;
3030
dct:title "LinkedDataHub" ;
3131
lapp:origin <https://localhost:4443> ;
3232
ldt:ontology <https://localhost:4443/ns#> ;
@@ -38,7 +38,7 @@
3838

3939
<urn:linkeddatahub:apps/test/admin>
4040
{
41-
<urn:linkeddatahub:apps/test/admin> a lapp:Application, lapp:AdminApplication ;
41+
<urn:linkeddatahub:apps/test/admin> a lapp:Application ;
4242
dct:title "Test admin" ;
4343
lapp:origin <https://admin.test.localhost:4443> ;
4444
ldt:ontology <https://w3id.org/atomgraph/linkeddatahub/admin#> ;
@@ -49,7 +49,7 @@
4949

5050
<urn:linkeddatahub:apps/test/end-user>
5151
{
52-
<urn:linkeddatahub:apps/test/end-user> a lapp:Application, lapp:EndUserApplication ;
52+
<urn:linkeddatahub:apps/test/end-user> a lapp:Application ;
5353
dct:title "Test" ;
5454
lapp:origin <https://test.localhost:4443> ;
5555
ldt:ontology <https://test.localhost:4443/ns#> ;

http-tests/config/services.trig renamed to http-tests/config/system.trig

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
@prefix lapp: <https://w3id.org/atomgraph/linkeddatahub/apps#> .
12
@prefix a: <https://w3id.org/atomgraph/core#> .
23
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
34
@prefix ldt: <https://www.w3.org/ns/ldt#> .
45
@prefix sd: <http://www.w3.org/ns/sparql-service-description#> .
56
@prefix dct: <http://purl.org/dc/terms/> .
67

78
### internal deployment wiring - not for public sharing ###
8-
### maps apps to their backend SPARQL services ###
9+
### maps apps to their backend SPARQL services, and assigns admin/end-user roles ###
910

10-
# root admin - service binding
11+
# root admin - type + service binding
1112

1213
<urn:linkeddatahub:apps/admin>
1314
{
14-
<urn:linkeddatahub:apps/admin> ldt:service <urn:linkeddatahub:services/admin> .
15+
<urn:linkeddatahub:apps/admin> a lapp:AdminApplication ;
16+
ldt:service <urn:linkeddatahub:services/admin> .
1517
}
1618

1719
# root admin - service description
@@ -26,11 +28,12 @@
2628
a:quadStore <http://fuseki-admin:3030/ds/> .
2729
}
2830

29-
# root end-user - service binding
31+
# root end-user - type + service binding
3032

3133
<urn:linkeddatahub:apps/end-user>
3234
{
33-
<urn:linkeddatahub:apps/end-user> ldt:service <urn:linkeddatahub:services/end-user> .
35+
<urn:linkeddatahub:apps/end-user> a lapp:EndUserApplication ;
36+
ldt:service <urn:linkeddatahub:services/end-user> .
3437
}
3538

3639
# root end-user - service description
@@ -45,11 +48,12 @@
4548
a:quadStore <http://fuseki-end-user:3030/ds/> .
4649
}
4750

48-
# test admin - service binding
51+
# test admin - type + service binding
4952

5053
<urn:linkeddatahub:apps/test/admin>
5154
{
52-
<urn:linkeddatahub:apps/test/admin> ldt:service <urn:linkeddatahub:services/test/admin> .
55+
<urn:linkeddatahub:apps/test/admin> a lapp:AdminApplication ;
56+
ldt:service <urn:linkeddatahub:services/test/admin> .
5357
}
5458

5559
# test admin - service description
@@ -64,11 +68,12 @@
6468
a:quadStore <http://fuseki-admin:3030/ds/> .
6569
}
6670

67-
# test end-user - service binding
71+
# test end-user - type + service binding
6872

6973
<urn:linkeddatahub:apps/test/end-user>
7074
{
71-
<urn:linkeddatahub:apps/test/end-user> ldt:service <urn:linkeddatahub:services/test/end-user> .
75+
<urn:linkeddatahub:apps/test/end-user> a lapp:EndUserApplication ;
76+
ldt:service <urn:linkeddatahub:services/test/end-user> .
7277
}
7378

7479
# test end-user - service description

‎http-tests/docker-compose.http-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- JPDA_ADDRESS=*:8000 # debugger host - performance hit when enabled
1313
volumes:
1414
- ./http-tests/config/dataspaces.trig:/var/linkeddatahub/datasets/dataspaces.trig:ro
15-
- ./http-tests/config/services.trig:/var/linkeddatahub/datasets/services.trig:ro
15+
- ./http-tests/config/system.trig:/var/linkeddatahub/datasets/system.trig:ro
1616
- ./http-tests/root-owner.trig.template:/var/linkeddatahub/root-owner.trig.template:ro
1717
- ./datasets/owner:/var/linkeddatahub/datasets/owner
1818
- ./datasets/secretary:/var/linkeddatahub/datasets/secretary

‎src/main/resources/com/atomgraph/linkeddatahub/lapp.ttl‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,6 @@
3636
rdfs:comment "Links a resource to an application" ;
3737
rdfs:isDefinedBy : .
3838

39-
:adminApplication a owl:ObjectProperty, owl:FunctionalProperty, owl:InverseFunctionalProperty ;
40-
rdfs:subPropertyOf :application ;
41-
owl:inverseOf :endUserApplication ;
42-
rdfs:domain :EndUserApplication ;
43-
rdfs:range :AdminApplication ;
44-
rdfs:label "Admin application" ;
45-
rdfs:comment "Links end-user application to its administration application" ;
46-
rdfs:isDefinedBy : .
47-
48-
:endUserApplication a owl:ObjectProperty, owl:FunctionalProperty, owl:InverseFunctionalProperty ;
49-
rdfs:subPropertyOf :application ;
50-
owl:inverseOf :adminApplication ;
51-
rdfs:domain :AdminApplication ;
52-
rdfs:range :EndUserApplication ;
53-
rdfs:label "End-user application" ;
54-
rdfs:comment "Links administration application to its end-user application" ;
55-
rdfs:isDefinedBy : .
56-
5739
:frontendProxy a owl:ObjectProperty ;
5840
rdfs:domain :Dataset ;
5941
rdfs:range rdfs:Resource ;
@@ -123,10 +105,6 @@
123105

124106
:EndUserApplication a rdfs:Class, owl:Class ;
125107
spin:constructor :EndUserApplicationConstructor ;
126-
spin:constraint [ a ldh:MissingPropertyValue ;
127-
rdfs:label "Missing admin application" ;
128-
sp:arg1 :adminApplication
129-
] ;
130108
rdfs:label "End-user application" ;
131109
rdfs:comment "Application with a dynamic access control and sitemap" ;
132110
rdfs:isDefinedBy : .
@@ -143,7 +121,6 @@
143121
CONSTRUCT {
144122
$this dct:title [ a xsd:string ] ;
145123
dct:description [ a xsd:string ] ;
146-
lapp:adminApplication [ a lapp:AdminApplication ] ;
147124
ac:stylesheet [ a ldh:File ] ;
148125
lapp:public [ a xsd:boolean ] .
149126
}
@@ -155,24 +132,18 @@
155132

156133
:AdminApplication a rdfs:Class, owl:Class ;
157134
spin:constructor :AdminApplicationConstructor ;
158-
spin:constraint [ a ldh:MissingPropertyValue ;
159-
rdfs:label "Missing end-user application" ;
160-
sp:arg1 :endUserApplication
161-
] ;
162135
rdfs:label "Admin application" ;
163136
rdfs:comment "Meta-application that manages the access control and sitemap of the main end-user application" ;
164137
rdfs:isDefinedBy : .
165138

166139
:AdminApplicationConstructor a ldh:Constructor ;
167140
sp:text """
168-
PREFIX lapp: <https://w3id.org/atomgraph/linkeddatahub/apps#>
169141
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
170142
PREFIX dct: <http://purl.org/dc/terms/>
171143
172144
CONSTRUCT {
173145
$this dct:title [ a xsd:string ] ;
174146
dct:description [ a xsd:string ] ;
175-
lapp:endUserApplication [ a lapp:EndUserApplication ] ;
176147
}
177148
WHERE {}""" ;
178149
rdfs:label "Admin application constructor" ;

0 commit comments

Comments
 (0)