Moved services to their own named graphs

Author: namedgraph

config/system.trig

@@ -27,13 +27,19 @@
         lapp:endUserApplication <urn:linkeddatahub:apps/end-user> ;
         lapp:frontendProxy <http://varnish-frontend:6060/> .
 
+}
+
+<urn:linkeddatahub:services/admin>
+{
+
     <urn:linkeddatahub:services/admin> a sd:Service ;
         dct:title "LinkedDataHub admin service" ;
         sd:supportedLanguage sd:SPARQL11Query, sd:SPARQL11Update ;
         sd:endpoint <http://fuseki-admin:3030/ds/> ;
         a:graphStore <http://fuseki-admin:3030/ds/> ;
         a:quadStore <http://fuseki-admin:3030/ds/> ;
         lapp:backendProxy <http://varnish-admin/> .
+
 }
 
 # root end-user
@@ -51,11 +57,17 @@
         lapp:frontendProxy <http://varnish-frontend:6060/> ;
         lapp:public true .
 
+}
+
+<urn:linkeddatahub:services/end-user>
+{
+
     <urn:linkeddatahub:services/end-user> a sd:Service ;
         dct:title "LinkedDataHub service" ;
         sd:supportedLanguage sd:SPARQL11Query, sd:SPARQL11Update ;
         sd:endpoint <http://fuseki-end-user:3030/ds/> ;
         a:graphStore <http://fuseki-end-user:3030/ds/> ;
         a:quadStore <http://fuseki-end-user:3030/ds/> ;
         lapp:backendProxy <http://varnish-end-user/> .
+
 }

platform/select-root-services.rq

@@ -12,32 +12,40 @@ SELECT ?endUserApp ?endUserOrigin ?endUserQuadStore ?endUserEndpoint ?endUserAut
         ?endUserApp lapp:origin ?endUserOrigin ;
             ldt:service ?endUserService ;
             lapp:adminApplication ?adminApp .
-        ?endUserService a:quadStore ?endUserQuadStore ;
-            sd:endpoint ?endUserEndpoint .
-        OPTIONAL
+        
+        GRAPH ?endUserServiceGraph
         {
-            ?endUserService a:authUser ?endUserAuthUser ;
-                a:authPwd ?endUserAuthPwd .
-        }
-        OPTIONAL
-        {
-            ?endUserService foaf:maker ?endUserMaker
+            ?endUserService a:quadStore ?endUserQuadStore ;
+                sd:endpoint ?endUserEndpoint .
+            OPTIONAL
+            {
+                ?endUserService a:authUser ?endUserAuthUser ;
+                    a:authPwd ?endUserAuthPwd .
+            }
+            OPTIONAL
+            {
+                ?endUserService foaf:maker ?endUserMaker
+            }
         }
     }
     GRAPH ?adminAppGraph
     {
         ?adminApp ldt:service ?adminService ;
             lapp:origin ?adminOrigin .
-        ?adminService a:quadStore ?adminQuadStore ;
-            sd:endpoint ?adminEndpoint .
-        OPTIONAL
-        {
-            ?adminService a:authUser ?adminAuthUser ;
-                a:authPwd ?adminAuthPwd .
-        }
-        OPTIONAL
+
+        GRAPH ?adminServiceGraph
         {
-            ?adminService foaf:maker ?adminMaker
+            ?adminService a:quadStore ?adminQuadStore ;
+                sd:endpoint ?adminEndpoint .
+            OPTIONAL
+            {
+                ?adminService a:authUser ?adminAuthUser ;
+                    a:authPwd ?adminAuthPwd .
+            }
+            OPTIONAL
+            {
+                ?adminService foaf:maker ?adminMaker
+            }
         }
     }
 }