update jdeb

Author: alegrm

CHANGES.txt

@@ -1,4 +1,5 @@
-release date=16:13 16.06.2015,version=1.2.0,urgency=low,by=Alejandra Garcia-Rojas M <[email protected]>,distribution=dstack-nightly
- * Coevolution service integration
- * Component management refactoring
- * Substantial refactored code
+release date=16:13 23.10.2015,version=1.2.0,urgency=low,by=Alejandra Garcia-Rojas M <[email protected]>,distribution=ldstack-nightly
+ * Third year release
+ * Substantial refactored code for REST services
+ * integration Fagi of and esta-ld, and coevolution
+ * data provenance in graphs

src/deb/control/control

@@ -1,12 +1,15 @@
-Package: deer-service
-Version: 0.1.1
+Package: geoknow-generator-ui
+Distribution: ldstack-nightly
+Version: 1.2.0
 Section: web
 Priority: extra
 Architecture: all
-Depends: tomcat7
+Depends: tomcat7,spring-batch-admin-geoknow,coevolution-debian-package,limes-service,deer-service,triplegeo-service,esta-ld
 Maintainer: Alejandra Garcia-Rojas M <[email protected]>
-Distribution: ldstack-nightly
-Homepage: https://github.com/GeoKnow/DEER-Service
-Description: A REST service for DEER (https://github.com/GeoKnow/DEER)
- for Linked Data enrichment, developed within GeoKnow project (http://geoknow.eu/),
- and part of the Linked Data Stack (http://stack.linkeddata.org/).
+Homepage: http://stack.linkeddata.org/getting-started/geoknow-generator/
+Description: The GeoKnow Generator provides a workbench that integrates of tools
+ developed within GeoKnow project (http://geoknow.eu/),
+ and are part of the Linked Data Stack (http://stack.linkeddata.org/).
+ These workbench aim to provide the required methods and tools
+ to easly integrate and process geospatial data
+ across a wide range of data sources on the web of data. 

src/main/resources/log4j.properties

@@ -7,4 +7,4 @@ log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
 
-log4j.logger.eu.geoknow=DEBUG
+log4j.logger.eu.geoknow=INFO

src/main/resources/system-components-template.ttl

@@ -12,6 +12,8 @@
 
 ########### COMPONENT DESCRIPTION #######################################################
 # Following triples  describes the configuration of components in the framework
+# Check https://github.com/GeoKnow/GeoKnowGeneratorUI/wiki/Configuration for detailed
+# description of configuration triples in this file
 # #######################################################################################
 
 :Virtuoso
@@ -24,6 +26,8 @@
 
 # #######################################################################################
 # the user and password provided in VirtuosoConductor should exixt
+# Check https://github.com/GeoKnow/GeoKnowGeneratorUI/wiki/Configuration for detailed
+# description of configuration triples in this file
 # #######################################################################################
 
 :VirtuosoConductor 
@@ -36,6 +40,8 @@
 
 # #######################################################################################
 # the user and password provided in VirtuosoAuthSPARQLEndpoint will be created at setup
+# Check https://github.com/GeoKnow/GeoKnowGeneratorUI/wiki/Configuration for detailed
+# description of configuration triples in this file
 # #######################################################################################
 
 :VirtuosoAuthSPARQLEndpoint
@@ -132,7 +138,7 @@
 :DEERService
       a       lds:EnrichmentService ;
       rdfs:label "Deer" ;
-      lds:serviceUrl <http://localhost:8080/deer-service/> .
+      lds:serviceUrl <http://localhost:8080/deer-Service> .
 
 :OntoWiki
       a       lds:StackComponent ;
@@ -173,7 +179,7 @@
       rdfs:label "Public-Private Data Coevolution"^^xsd:string ;
       lds:providesService :CoevolutionService ;
       dcterms:hasVersion "1.0.0"^^xsd:string ;
-      foaf:homepage <http://localhost:8080/coevolution-service/> .
+      foaf:homepage <http://geoknow-generator.aws.semweb.unister.de:8080/coevolution-service/> .
 
 :CoevolutionService
       a       lds:PublicationService ;
@@ -249,9 +255,12 @@
       ontos:route "/workbench/linking-and-fusing/fagi-gis"^^xsd:string;
       ontos:requiresService :FagiGisService .
 
-
 :CoevRouteRestriction
       a     ontos:RouteRestriction;
       ontos:route "/workbench/evolution-and-repair/coevolution-apply"^^xsd:string;
       ontos:requiresService :CoevolutionService .
 
+:EstaLDRestriction
+      a     ontos:RouteRestriction;
+      ontos:route "/workbench/search-querying-and-exploration/esta-ld"^^xsd:string;
+      ontos:requiresService :esta-ld-service .

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

@@ -13,8 +13,8 @@
 # This file contains the configuration for the GeoKnow generator concerning
 # the endpoints and default user credentials
 # To have different instances of the workbench different prefixes for projects:
-# Replace ***PROJECT_URL*** with the desided URI
-# Replace ***REMOVED*** with the corresponding data
+# Check https://github.com/GeoKnow/GeoKnowGeneratorUI/wiki/Configuration for detailed
+# description of configuration triples in this file
 # #######################################################################################
 
 # These triples describes the URL endpoints for the application
@@ -27,10 +27,9 @@
   ontos:publicEndpoint :VirtuosoEndpoint ;
   ontos:authEndpoint :VirtuosoAuthSPARQLEndpoint ;
   ontos:frameworkDataDir "/var/generator"^^xsd:string ;
-  foaf:homepage <http://localhost:8080/generator> ;
+  foaf:homepage <http://localhost:8080/generator/> ;
   sd:defaultDataset :default-dataset;  
-  lds:integrates :Virtuoso, :SpringBatch, :RdfImport, :Coevolution;
-  # :Facete, :Limes, :Sparqlify, :TripleGeo, :GeoLift, :esta-ld, :Mappify, :FagiGis, :DEER, 
+  lds:integrates :Virtuoso, :SpringBatch, :RdfImport, :Coevolution, :Facete, :Limes, :Sparqlify, :TripleGeo, :GeoLift, :esta-ld, :Mappify, :FagiGis, :DEER;
   lds:requires :Virtuoso, :SpringBatch, :Coevolution;
   lds:providesService :PublishingService, :UserManagerService, :EmailService
   .
@@ -42,17 +41,17 @@
 
 :EmailService
   a       lds:EmailService ;
-  dcterms:description "Provides functionality to send email notifications to users, and especially to send login information."^^xsd:string ;
-  lds:password "***REMOVED***"^^xsd:string ;
-  lds:user "***REMOVED***"^^xsd:string ;
-  foaf:mbox <mailto:***REMOVED***> ;
-  ontos:smtpHost "smtp.gmail.com"^^xsd:string ;
+  dcterms:description "Provides functionality to send email, especially to send login information."^^xsd:string ;
+  lds:password "fakepwd"^^xsd:string ;
+  lds:user "[email protected]"^^xsd:string ;
+  foaf:mbox <mailto:[email protected]> ;
+  ontos:smtpHost "smtp.example.com"^^xsd:string ;
   ontos:smtpTlsPort "587"^^xsd:string ;
   ontos:smtpSslPort "465"^^xsd:string .
 
 :PublishingService
   a       lds:PublicationService ;
-  dcterms:description "Provides functionality to upload data to a target graph from several graphs and to do versioning."^^xsd:string ;
+  dcterms:description "Provides functionalit to upload data to a target graph varius graphs and to do a versioning."^^xsd:string ;
   lds:serviceUrl <http://localhost:8080/generator/rest/publish> . 
 
 ##################################################################
@@ -75,4 +74,3 @@
   dcterms:title "default"^^xsd:string;
   dcterms:description "Default graph"^^xsd:string 
   .
-