small changes config and README

Author: alegrm

README.md

@@ -4,44 +4,40 @@ The GeoKnow Generator provides workbench that integrates of tools developed with
 
 ## Install
 
-* __From Debian package__: The GeoKnow Generator UI is available as a debuian package, to install follow [these](http://stack.linkeddata.org/documentation/installation-of-a-local-generator-demonstrator/) instructions.
-
-* __Form source__: You can use `maven pacakge` to package the souces in a war file and deploy it on a servlet container. 
+* __From Debian package__: The GeoKnow Generator UI is available as a debuian package, to install follow [these](http://stack.linkeddata.org/documentation/installation-of-a-local-generator-demonstrator/) instructions. This is a preconfigured application that assumes that a triple store is installed in the localhost.
+* __Form source__: Follow the configuration instructiobs below, and use `maven pacakge` to package the souces in a war file and deploy it on a servlet container. 
 
 These option will not install any integrated component from the stack and you require to install each one. You can choose to use again Debian packages following [these](http://stack.linkeddata.org/documentation/installation-of-a-local-generator-demonstrator/) instructions, or manually visiting each developer's component installation guides.
 
 ## Configuration
 
-### Application configuration
-
-1. Make a copy of the `src/main/resources/framework-configuration-template.ttl` to `src/main/resources/framework-configuration.ttl` and provide the ***REMOVED*** data.
+### Requirements
 
-2. Have a clean triple store and make sure to have a user create in the lds:StorageService, the lds:SecuredSPARQLEndPointService user will be automatically created
 
-3. Make a copy of the `src/main/webapp/WEB-INF/web-template.xml` to `src/main/webapp/WEB-INF/web.xml` and provide the ***REMOVED*** data.
+* Have a clean triple store and make sure to have a superuser created.
 
+### Application configuration
 
-Note that the endpoint has to support [UPDATE](http://www.w3.org/TR/2013/REC-sparql11-update-20130321/) service and [Graph Store HTTP Protocol](http://www.w3.org/TR/2013/REC-sparql11-http-rdf-update-20130321/) 
-	
+1. Open the `src/main/resources/framework-configuration.ttl` and provide endpoints, users and password information in the lds:StorageService element. The  lds:SecuredSPARQLEndPointService user will be automatically created in the setup.
 
-## Optional Extra Configutation
+2. Open the `src/main/resources/framework-components.ttl` and make sure URLs for alll stack components are accurate.
 
-Depending on the components you use in the Generator some extra configurations may be required.  
+2. Edit `src/main/webapp/WEB-INF/web.xml` and provide the ***REMOVED*** data.
 
-### Using Virtuoso Endpoint
 
-If you have a Virtuoso Endpoint, you can configure the following: 
+Note that the endpoint has to support [UPDATE](http://www.w3.org/TR/2013/REC-sparql11-update-20130321/) service and [Graph Store HTTP Protocol](http://www.w3.org/TR/2013/REC-sparql11-http-rdf-update-20130321/) 
+	
+### Application setup
 
-1. Enable SPARQL Update on a Virtuoso SPARQL by excecuting the following lines in the isql utility:
+To initalize the application the user is only required to navigate to the URL where the application has being deployed and a setup page will be shown. The application requires a system file (e.g. `/etc/generator/`) with write privileges for creating a init file that will be used as a flag for setting the system up.
 
-		$ isql-vt
-		GRANT SPARQL_UPDATE TO "SPARQL"
-		GRANT EXECUTE ON DB.DBA.L_O_LOOK TO "SPARQL"
+### Virtuoso Endpoint
 
-2. [Enable CORS for Virtuoso](http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtTipsAndTricksCORsEnableSPARQLURLs) SPARQL endpoint.
+Currently ontly Virtuoso store is supported and it has being tested in version 7.1. The Generator makes use of Virtuoso users management to allow the creation of private graphs and allow them to grant access to to specific users. 
 
-### Authentication configuration
+## Optional Extra Configutation
 
+Depending on the components you use in the Generator some extra configurations may be required.  
 
 
 ### Using OntoWiki-Virtuoso

src/main/webapp/js/app.js

@@ -174,10 +174,16 @@ app.config(function($routeSegmentProvider, $routeProvider)
             .up()
 
         .segment('account', {
-            templateUrl:'js/account/account.html' })
+            templateUrl:'js/account/account.html',
+            resolve: {
+                        settings: function (ConfigurationService) {
+                        return ConfigurationService.getSettings();
+                    }
+            }})
             .within()
                 .segment('preferences', {
-                    templateUrl: 'js/account/preferences/preferences.html' })
+                    templateUrl: 'js/account/preferences/preferences.html'
+                })
             .up()
         .segment('system-setup', {
             templateUrl: 'system-setup.html',

src/main/webapp/js/services/config.js

@@ -35,15 +35,14 @@ angular.module("app.configuration", [])
     var FRAMEWORK_URI;
     var FLAG_PATH;
     var NS;
-    var DEFAULT_SETTINGS_GRAPH_URI;
-    var GROUPS_GRAPH_URI;
+    var DEFAULT_SETTINGS_GRAPH;
+    var GROUPS_GRAPH;
     var FRAMEWORK_ONTOLOGY_NS;
     var ACCOUNTS_GRAPH;
 
     var AUTH_ENDPOINT;
     var PUBLIC_ENDPOINT;
-    var SETTINGS_GRAPH_URI;
-    var GRAPH;
+    var SETTINGS_GRAPH;
 
     // a variable to lookup by prefix
     var prefixes;
@@ -179,26 +178,27 @@ angular.module("app.configuration", [])
 
     var getDefaultSettingsGraph = function()
     {
-        return DEFAULT_SETTINGS_GRAPH_URI;
+        return DEFAULT_SETTINGS_GRAPH;
     };
 
-    var setDefaultSettingsGraph = function(default_settings_graph_uri)
+    var setDefaultSettingsGraph = function(default_settings_graph)
     {
-        DEFAULT_SETTINGS_GRAPH_URI = default_settings_graph_uri;
+        DEFAULT_SETTINGS_GRAPH = default_settings_graph;
     };
 
-    var getGraph = function()
+    var getSettingsGraph = function()
     {
-        return SETTINGS_GRAPH_URI;
+        return SETTINGS_GRAPH;
     };
 
-    var setGraph = function(uri) {
-        SETTINGS_GRAPH_URI = uri;
-        GRAPH = "<" + SETTINGS_GRAPH_URI + ">";
+    var setSettingsGraph = function(uri) {
+        SETTINGS_GRAPH = uri;
+        // update settings with new graph
+        read();
     };
 
     var restoreDefault = function() {
-        return setGraph(DEFAULT_SETTINGS_GRAPH_URI);
+        return setSettingsGraph(DEFAULT_SETTINGS_GRAPH);
     };
 
     var getSettings = function()
@@ -290,18 +290,18 @@ angular.module("app.configuration", [])
     };
 
 
-    var read = function(graph)
+    var read = function()
     {
         var deferred = $q.defer();
         var requestData = {
             format: "application/sparql-results+json",
-            query: "SELECT * FROM <" + graph + ">"+ EOL
+            query: "SELECT * FROM <" + SETTINGS_GRAPH + ">"+ EOL
                     + "WHERE { ?s ?p ?o }" + EOL
                     + "ORDER BY ?s ?p ?o",
             mode: "settings"
         };
 
-        console.log("readSettings from " + graph);
+        console.log("readSettings from " + SETTINGS_GRAPH);
 
         $http.post("RdfStoreProxy", $.param(requestData)).then(function (response) {
             settings = parseSparqlResults(response.data);
@@ -348,9 +348,9 @@ angular.module("app.configuration", [])
         var requestData = {
             format: "application/sparql-results+json",
             query: PREFIXES
-                    + "DROP SILENT GRAPH "   + GRAPH + EOL
-                    + "CREATE SILENT GRAPH " + GRAPH + EOL
-                    + "INSERT INTO " + GRAPH + EOL
+                    + "DROP SILENT GRAPH <"   + SETTINGS_GRAPH + ">" + EOL
+                    + "CREATE SILENT GRAPH <" + SETTINGS_GRAPH + ">" + EOL
+                    + "INSERT INTO <" + SETTINGS_GRAPH + ">" + EOL
                     + "{" + EOL
                     +        data
                     + "}",
@@ -371,15 +371,15 @@ angular.module("app.configuration", [])
     };
 
     var getGroupsGraph = function() {
-        return GROUPS_GRAPH_URI;
+        return GROUPS_GRAPH;
     };
 
-    var setGroupsGraph = function(groups_graph_uri) {
-        GROUPS_GRAPH_URI = groups_graph_uri;
+    var setGroupsGraph = function(groups_graph) {
+        GROUPS_GRAPH = groups_graph;
     };
 
-    var setGroupsGraph = function(groups_graph_uri) {
-        GROUPS_GRAPH_URI = groups_graph_uri;
+    var setGroupsGraph = function(groups_graph) {
+        GROUPS_GRAPH = groups_graph;
     };
 
     var getFrameworkOntologyNS = function() {
@@ -411,8 +411,6 @@ angular.module("app.configuration", [])
         setAuthEndpoint         : setAuthEndpoint,
         getDefaultSettingsGraph : getDefaultSettingsGraph,
         setDefaultSettingsGraph : setDefaultSettingsGraph,
-        getGraph                : getGraph,
-        setGraph                : setGraph,
         getGroupsGraph          : getGroupsGraph,
         setGroupsGraph          : setGroupsGraph,
         getFrameworkUri         : getFrameworkUri,
@@ -422,6 +420,8 @@ angular.module("app.configuration", [])
         getAccountsGraph        : getAccountsGraph,
         setAccountsGraph        : setAccountsGraph,
         restoreDefault          : restoreDefault,
+        setSettingsGraph        : setSettingsGraph,
+        getSettingsGraph        : getSettingsGraph,
         getSettings             : getSettings,
         select                  : select,
         write                   : write,

src/main/webapp/js/services/configuration-service.js

@@ -7,13 +7,13 @@ module.factory('ConfigurationService', function ($q, AccountService, Config, $ht
     var SettingsService = {
         getSettings : function(){
             var defer = $q.defer();
-            if(Config.getGraph() == undefined){
+            if(Config.getSettingsGraph() == undefined){
                 $http.get("rest/config").then(
                     function (response) {
                         Config.setFrameworkUri(response.data.frameworkUri);
                         Config.setNS(response.data.ns);
                         Config.setDefaultSettingsGraph(response.data.defaultSettingsGraphUri);
-                        Config.setGraph(response.data.defaultSettingsGraphUri);
+                        Config.setSettingsGraph(response.data.defaultSettingsGraphUri);
                         Config.setGroupsGraph(response.data.groupsGraphUri);
                         Config.setFrameworkOntologyNS(response.data.frameworkOntologyNs);
                         Config.setAccountsGraph(response.data.accountsGraph);
@@ -22,22 +22,23 @@ module.factory('ConfigurationService', function ($q, AccountService, Config, $ht
                         Config.setFlagPath(response.data.flagPath);
                         Config.namespaces[Config.getNS()] = ":";
                         Config.buildPrefixesString();
-                        console.log("Settings Graph:" + Config.getGraph());
-                        Config.read(Config.getGraph()).then(function(settings){
-                            console.log("settings");
-                            console.log(settings);
+                        Config.read().then(function(settings){
+                            var currentAccount = angular.copy(AccountService.getAccount()); 
+                            console.log("user:" +currentAccount.user);
+                            // Try to get here the user's settings graph
                             defer.resolve(settings);
                         });
+
                     }, function(response){
                         var message = ServerErrorResponse.getMessage(response.status);
                         flash.error = message;
                     })
                 } else{
-                    if( AccountService.isLogged() ){
-                        console.log("get the settings graph of the user");
-                        console.log(AccountService.getAccountURI());
-                    }
-                    defer.resolve(Config.getSettings);
+                    // if( AccountService.isLogged() ){
+                    //     console.log("get the settings graph of the user");
+                    //     console.log(AccountService.getAccountURI());
+                    // }
+                    defer.resolve(Config.getSettings());
                 }
              return defer.promise;
         },
@@ -59,19 +60,10 @@ module.factory('ConfigurationService', function ($q, AccountService, Config, $ht
         },
 
         getSPARQLEndpoint: function () {
-            // var settings = Config.getSettings();
-            // console.log(Config.getFrameworkUri());
-            // console.log(settings);
-            // var endpoint = settings[Config.getFrameworkUri()]["gkg:authEndpoint"][0];
-            // var endpointUrl = settings[endpoint]["lds:serviceUrl"][0];
             return Config.getAuthEndpoint();
         },
 
         getPublicSPARQLEndpoint: function () {
-            // var settings = Config.getSettings();
-            // var endpoint = settings[Config.getFrameworkUri()]["gkg:publicEndpoint"][0];
-            // var endpointUrl = settings[endpoint]["lds:serviceUrl"][0];
-            // return endpointUrl;
             return Config.getEndpoint();
         },
 
@@ -96,15 +88,15 @@ module.factory('ConfigurationService', function ($q, AccountService, Config, $ht
         },
 
         getDefaultSettingsGraph: function () {
-            return Config.getGraph();
+            return Config.getDefaultSettingsGraph();
         },
 
         getSettingsGraph: function () {
-            return Config.getGraph();
+            return Config.getSettingsGraph();
         },
 
         setSettingsGraph: function (uri) {
-            Config.setGraph(uri);
+            Config.setSettingsGraph(uri);
         },
 
         restoreDefaultSettingsGraph: function () {