Skip to content
This repository was archived by the owner on Apr 22, 2022. It is now read-only.

Commit f519dfa

Browse files
alegrmalegrm
committed
fagi integration
1 parent ef6f13c commit f519dfa

File tree

23 files changed

+386
-124
lines changed

23 files changed

+386
-124
lines changed

‎deb-package/build_debpkg.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
MODULE_NAME=geoknow-generator-ui_1.0.1
3+
MODULE_NAME=geoknow-generator-ui_1.1.0
44

55
echo "Building Debian package for ${MODULE_NAME}"
66
rm -rf ../target/debian

‎deb-package/debian/changelog‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
geoknow-generator-ui (1.0.2) ldstack-nightly; urgency=low
1+
geoknow-generator-ui (1.1.0) ldstack-nightly; urgency=low
22

33
* Intermediate release of GeoKnow Generatro Workbench
44
* Includes user authentication and users and role management
55
* Implements graph level access control
66
* Requires spring batch admin generator for running batch processes
77

8-
-- Alejandra Garcia Rojas <[email protected]> Tue, 25 Nov 2014 17:11:12 +0200
8+
-- Alejandra Garcia Rojas M <[email protected]> Tue, 25 Nov 2014 17:11:12 +0200

‎deb-package/debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: geoknow-generator-ui
22
Section: web
33
Priority: extra
4-
Maintainer: Vadim Zaslawski <vadim.zaslawski@ontos.com>
4+
Maintainer: Alejandra Garcia Rojas M <alejandra.garciarojas@ontos.com>
55
Build-Depends: debhelper (>= 8.0.0)
66
Standards-Version: 3.9.4
77
Homepage: http://stack.linkeddata.org/

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>eu.geoknow</groupId>
55
<artifactId>generator</artifactId>
66
<packaging>war</packaging>
7-
<version>1.0.1</version>
7+
<version>1.1.0</version>
88
<name>GeoKnow Generator</name>
99

1010
<properties>

‎src/main/java/workflow/beans/Registration.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class Registration {
88
private String name;
99
private String resource;
1010
private String description;
11-
private String cereated;
11+
private String created;
1212
private int executionCount;
1313
private boolean launchable;
1414
private boolean incrementable;
@@ -75,12 +75,12 @@ public void setJobInstances(NavigableMap<Integer, JobInstance> jobInstances) {
7575
this.jobInstances = jobInstances;
7676
}
7777

78-
public String getCereated() {
79-
return cereated;
78+
public String getCreated() {
79+
return created;
8080
}
8181

82-
public void setCereated(String cereated) {
83-
this.cereated = cereated;
82+
public void setCreated(String created) {
83+
this.created = created;
8484
}
8585

8686
}

‎src/main/java/workflow/rest/Jobs.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public Response getJob(@CookieParam(value = "user") Cookie userc,
268268

269269
Registration job = BatchAdminClient.getJob(jobName);
270270
job.setDescription(jobDesc);
271-
job.setCereated(created);
271+
job.setCreated(created);
272272
// complete with execution information
273273

274274
Set<Integer> instances = job.getJobInstances().keySet();
@@ -360,7 +360,7 @@ public Response getJobs(@CookieParam(value = "user") Cookie userc,
360360
registration = BatchAdminClient.registerJob(jobId.replace(uriBase, ""), xml);
361361
} else {
362362
registration.setDescription(jobDesc);
363-
registration.setCereated(created);
363+
registration.setCreated(created);
364364
}
365365

366366
userRegistrations.add(registration);

‎src/main/resources/framework-components.ttl‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,18 @@
4343
# Following triples describes the configured components in the framework
4444
# #######################################################################################
4545

46+
47+
:FagiGis
48+
a lds:StackComponent ;
49+
rdfs:label "FAGI-gis"^^xsd:string ;
50+
lds:providesService :FagiGisService ;
51+
lds:version "1.1+rev0"^^xsd:string ;
52+
foaf:homepage <https://github.com/GeoKnow/FAGI-gis> .
53+
54+
:FagiGisService
55+
a lds:ExplorationService ;
56+
lds:serviceUrl <http://localhost:8080/FAGI-WebInterface/> .
57+
4658
:Sparqlify
4759
a lds:StackComponent ;
4860
rdfs:label "Sparqlify"^^xsd:string ;
@@ -52,7 +64,7 @@
5264

5365
:SparqlifyService
5466
a lds:ExplorationService ;
55-
lds:serviceUrl <http://localhost:8080/sparqlify/> .
67+
lds:serviceUrl <http://192.168.2.18:8080/sparqlify/> .
5668

5769
:Facete
5870
a lds:StackComponent ;
@@ -62,7 +74,7 @@
6274
foaf:homepage <http://aksw.org/Projects/Facete.html> .
6375
:FaceteService
6476
a lds:ExplorationService ;
65-
lds:serviceUrl <http://cstadler.aksw.org/facete2/> .
77+
lds:serviceUrl <http://192.168.2.18:8080/facete2/> .
6678

6779
:Limes
6880
a lds:StackComponent ;
@@ -72,7 +84,7 @@
7284
foaf:homepage <http://aksw.org/Projects/LIMES.html> .
7385
:LimesService
7486
a lds:InterlinkingService ;
75-
lds:serviceUrl <http://generator.geoknow.eu:8080/limes-service/> .
87+
lds:serviceUrl <http://localhost:8080/limes-service/> .
7688

7789
:TripleGeo
7890
a lds:StackComponent ;
@@ -102,7 +114,7 @@
102114
foaf:homepage <http://aksw.org/Projects/OntoWiki.html> .
103115
:OntoWikiService
104116
a lds:AuthoringService ;
105-
lds:serviceUrl <http://generator.geoknow.eu/ontowiki> .
117+
lds:serviceUrl <http://192.168.2.18/OntoWiki> .
106118

107119
:Mappify
108120
a lds:StackComponent ;
@@ -172,6 +184,11 @@ a lds:BatchProcessingService ;
172184
a gkg:RouteRestriction;
173185
gkg:partialUrl "/workbench/linking-and-fusing/limes"^^xsd:string;
174186
gkg:requiredService :LimesService .
187+
188+
:FAGIgisRouteRestriction
189+
a gkg:RouteRestriction;
190+
gkg:partialUrl "/workbench/linking-and-fusing/fagi-gis"^^xsd:string;
191+
gkg:requiredService :FagiGisService .
175192

176193
:GeoLiftRouteRestriction
177194
a gkg:RouteRestriction;

‎src/main/resources/framework-datasets.ttl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,13 @@
6363
foaf:homepage <http://www4.wiwiss.fu-berlin.de/drugbank> ;
6464
void:sparqlEndpoint <http://www4.wiwiss.fu-berlin.de/drugbank/sparql> .
6565

66+
:fagi
67+
a onots:Database , onots:DataSource ;
68+
rdfs:label "Fagi Data"^^xsd:string ;
69+
onots:dbHost "127.0.0.1"^^xsd:string ;
70+
onots:dbName "fagi"^^xsd:string ;
71+
onots:dbPassword "postgres"^^xsd:string ;
72+
onots:dbPort "5432"^^xsd:string ;
73+
onots:dbType onots:PostGIS ;
74+
onots:dbUser "postgres"^^xsd:string .
75+

‎src/main/webapp/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ <h5 class="modal-title green bold">Request password</h5>
235235
<script src="js/workbench/manual-revision-and-authoring/ontowiki-controller.js"></script>
236236
<script src="js/workbench/classification-and-enrichment/geolift-controller.js"></script>
237237
<script src="js/workbench/linking-and-fusing/limes-controller.js"></script>
238+
<script src="js/workbench/linking-and-fusing/fagi-gis-controller.js"></script>
238239
<script src="js/settings/settings-controller.js"></script>
239240
<script src="js/settings/datasets/graphs-controller.js"></script>
240241
<script src="js/settings/data-sources/endpoint-controller.js"></script>

‎src/main/webapp/js/app.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ app.config(function($routeSegmentProvider, $routeProvider)
5555
.when('/workbench/search-querying-and-exploration/mappify', 'workbench.mappify')
5656
.when('/workbench/manual-revision-and-authoring/ontowiki', 'workbench.ontowiki')
5757
.when('/workbench/linking-and-fusing/limes', 'workbench.limes')
58+
.when('/workbench/linking-and-fusing/fagi-gis', 'workbench.fagi-gis')
5859
.when('/workbench/classification-and-enrichment/geolift', 'workbench.geolift')
5960

6061
.segment('popup-limes', {
@@ -121,6 +122,8 @@ app.config(function($routeSegmentProvider, $routeProvider)
121122
templateUrl: 'js/workbench/classification-and-enrichment/geolift.html' })
122123
.segment('limes', {
123124
templateUrl: 'js/workbench/linking-and-fusing/limes.html' })
125+
.segment('fagi-gis', {
126+
templateUrl: 'js/workbench/linking-and-fusing/fagi-gis.html' })
124127
.up()
125128

126129
.segment('settings',{

0 commit comments

Comments
 (0)