Merge remote-tracking branch 'remotes/origin/ontos-ldiw-roles' into ontos-ldiw-acc: roles management, setup servlet, few gui fixes

Author: taleksashina

src/main/java/accounts/VirtuosoUserManager.java

@@ -81,7 +81,7 @@ public void setDefaultGraphPermissions(String graph, int permissions)
    * @throws SQLException
    */
   public void grantLOLook(String user) throws ClassNotFoundException, SQLException {
-    executeUpdate(getConnection(), "GRANT EXECUTE ON DB.DBA.L_O_LOOK TO '" + user + "'");
+    executeUpdate(getConnection(), "GRANT EXECUTE ON DB.DBA.L_O_LOOK TO \"" + user + "\"");
   }
 
     @Override

src/main/java/setup/RDFStoreSetupManager.java

@@ -100,8 +100,10 @@ public void setUp(FrameworkConfiguration config, boolean reset) throws Exception
         userManager.createUser(config.getAuthSparqlUser(), config.getAuthSparqlPassword());
         userManager.setDefaultRdfPermissions(config.getAuthSparqlUser(), 3);
         userManager.grantRole(config.getAuthSparqlUser(), "SPARQL_UPDATE");
+        userManager.grantLOLook(config.getAuthSparqlUser());
         try {
             userManager.grantRole("SPARQL", "SPARQL_UPDATE");
+            userManager.grantLOLook("SPARQL");
         } catch (Exception e) {
             //role is already granted
             e.printStackTrace();
@@ -134,6 +136,26 @@ public void setUp(FrameworkConfiguration config, boolean reset) throws Exception
         settingsModel.add(componentsModel);
         settingsModel.add(ontologyModel);
 
+        // add to settings virtuoso component without users/passwords
+        queryString = "PREFIX foaf:<http://xmlns.com/foaf/0.1/> "
+                + "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#> "
+                + "PREFIX rdfs:<http://www.w3.org/2000/01/rdf-schema#> "
+                + "PREFIX lds:<http://stack.linkeddata.org/ldis-schema/>" + " CONSTRUCT   { <"
+                + config.getFrameworkUri() + "> ?p ?o . " + "<" + config.getFrameworkUri()
+                + "> lds:integrates ?component ."
+                + "?component rdfs:label ?label . ?component rdf:type ?type . "
+                + "?component lds:providesService ?service . ?service rdf:type ?servicetype ."
+                + "?service lds:serviceUrl ?serviceUrl .} " + " WHERE  { <"
+                + config.getFrameworkUri() + "> ?p ?o ." + "<" + config.getFrameworkUri()
+                + "> lds:integrates ?component ."
+                + "?component rdfs:label ?label . ?component rdf:type ?type . "
+                + "?component lds:providesService ?service . ?service rdf:type ?servicetype ."
+                + "?service lds:serviceUrl ?serviceUrl .}";
+        QueryExecution qexec = QueryExecutionFactory.create(queryString, configurationModel);
+        Model triples = qexec.execConstruct();
+        settingsModel.add(triples);
+        qexec.close();
+
         // write the initial settings model (default settings for new users)
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         settingsModel.write(os, "N-TRIPLES");
@@ -161,7 +183,7 @@ public void setUp(FrameworkConfiguration config, boolean reset) throws Exception
                 + " PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX lds: <http://stack.linkeddata.org/ldis-schema/> "
                 + " SELECT ?accountName ?password ?mailto ?role WHERE { ?account rdf:type gkg:Account . ?account foaf:accountName ?accountName . "
                 + " ?account lds:password ?password . ?account foaf:mbox ?mailto . ?account gkg:Role ?role . } ";
-        QueryExecution qexec = QueryExecutionFactory.create(query, configurationModel);
+        qexec = QueryExecutionFactory.create(query, configurationModel);
         ResultSet results = qexec.execSelect();
         while (results.hasNext()) {
             QuerySolution soln = results.next();