Merge branch 'master' of github.com:GeoKnow/GeoKnowGeneratorUI into ontos-geoknow

Author: alegrm

README.md

@@ -16,7 +16,9 @@ These option will not install any integrated component from the stack and you re
 
 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.
 
-1. 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.
+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.
 
 
 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/) 

src/main/resources/framework-configuration-template.ttl

@@ -26,18 +26,18 @@
   rdfs:comment "This resource contains all the configuration required by the application"^^xsd:string ;
   rdfs:label "GeoKnowGeneator"^^xsd:string ;
   dcterms:hasVersion "2.0"^^xsd:string ;
-  lds:password "***REMOVED***""^^xsd:string ;         # an admin user for the webapp
+  lds:password "***REMOVED***""^^xsd:string ;         # an admin user for the webapp NOT IMPLEMENTED YET
   lds:user   "***REMOVED***""^^xsd:string ;
   gkg:publicEndpoint :VirtuosoEndpoint ;
-  gkg:authEndpoint :VirtuosoAutSPARQLEndpoint ;
+  gkg:authEndpoint :VirtuosoAuthSPARQLEndpoint ;
   lds:integrates :Virtuoso ;
   foaf:homepage <http://localhost:8080/generator> .
 
 :Virtuoso
   a       lds:StackComponent ;
   rdfs:label "Service URL"^^xsd:string ;
   dcterms:hasVersion "7.0"^^xsd:string ;
-  lds:providesService :VirtuosoConductor , :VirtuosoAutSPARQLEndpoint, :VirtuosoEndpoint;
+  lds:providesService :VirtuosoConductor , :VirtuosoAuthSPARQLEndpoint, :VirtuosoEndpoint;
   foaf:homepage <http://virtuoso.openlinksw.com/> .
 
 :VirtuosoConductor 
@@ -47,7 +47,7 @@
   lds:connectionString "jdbc:virtuoso://***REMOVED***:1111/"^^xsd:string;
   lds:user   "***REMOVED***""^^xsd:string . 
 
-:VirtuosoAutSPARQLEndpoint
+:VirtuosoAuthSPARQLEndpoint
   a       lds:SecuredSPARQLEndPointService ;
   lds:password "***REMOVED***"^^xsd:string ;
   lds:serviceUrl <http://***REMOVED***:8890/sparql-auth> ;
@@ -132,4 +132,3 @@
     dcterms:created "2014-04-12"^^xsd:date;
     void:sparqlEndpoint <http://10.0.0.63:8890/sparql> ]
   .
-

src/main/webapp/WEB-INF/web-template.xml

@@ -170,4 +170,4 @@
     <mime-type>application/rdf+xml</mime-type>
   </mime-mapping>
 
-</web-app> 
+</web-app>

src/main/webapp/popup.html

@@ -49,38 +49,51 @@
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
     <!-- <script src="lib/jquery/jquery-1.7.2.min.js"></script> -->
-    
     <script src="lib/jquery/jquery-1.9.1.js"></script>
     <script src="lib/jquery/jquery-ui-1.10.1.custom.min.js"></script>
 
-	<script src="lib/bootstrap/bootstrap.js"></script>
+    <script src="lib/bootstrap/bootstrap.js"></script>
     <script src="lib/angularjs/angular.js"></script>
     <script src="lib/angularjs/angular-cookies.js"></script>
     <script src="lib/angularjs/angular-route.js"></script>
     <script src="lib/modal-master/bootstrap-modal.js"></script>
     <script src="lib/modal-master/bootstrap-modalmanager.js"></script>
-    <script src="js/config.js"></script>
     <script src="js/app.js"></script>
-    <script src="js/services.js"></script>
-    <script src="js/controllers.js"></script>
-
-    <!-- TODO: check what libraries should be added here, refactoring changed -->
-
+    <!-- services for the different modules/pages -->
+    <script src="js/services/config.js"></script>
+    <script src="js/services/services.js"></script>
+    <script src="js/services/configuration-service.js"></script>
+    <script src="js/services/graph-service.js"></script>
+    <script src="js/services/account-service.js"></script>
+    <script src="js/services/login-service.js"></script>
+    <script src="js/services/graph-group-service.js"></script>
     <!-- controllers for the different modules/pages -->
     <script src="js/controllers.js"></script>
     <script src="js/login-controller.js"></script>
+    <script src="js/workbench/extraction-and-loading/import-rdf-controller.js"></script>
+    <script src="js/workbench/extraction-and-loading/sparqlify-controller.js"></script>
     <script src="js/workbench/extraction-and-loading/triplegeo-controller.js"></script>
+    <script src="js/workbench/search-querying-and-exploration/facete-controller.js"></script>
+    <script src="js/workbench/search-querying-and-exploration/mappify-controller.js"></script>
+    <script src="js/workbench/search-querying-and-exploration/virtuoso-controller.js"></script>
+    <script src="js/workbench/manual-revision-and-authoring/ontowiki-controller.js"></script>
     <script src="js/workbench/classification-and-enrichment/geolift-controller.js"></script>
     <script src="js/workbench/linking-and-fusing/limes-controller.js"></script>
+    <script src="js/settings/settings-controller.js"></script>
+    <script src="js/settings/datasets/graphs-controller.js"></script>
+    <script src="js/settings/data-sources/endpoint-controller.js"></script>
+    <script src="js/settings/data-sources/database-controller.js"></script>
+    <script src="js/settings/namespaces/namespaces-controller.js"></script>
+    <script src="js/settings/components/components-controller.js"></script>
+    <script src="js/account/account-controller.js"></script>
 
-
+    <!-- directives -->
     <script src="js/directives.js"></script>
     <script src="lib/osm/OpenLayers.js"></script>
     <script src="lib/ui-bootstrap/ui-bootstrap-tpls-0.6.0.min.js"></script>
     <script src="lib/angular-route-segment/angular-route-segment.min.js"></script>
     <script src="lib/angular-file-upload-master/angular-file-upload.min.js"></script>
     <script src="lib/angular-file-upload-master/FileAPI.min.js"></script>
     <script src="lib/angular-flash.min.js"></script>
-
   </body>
 </html>