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

Commit 0fb0f00

Browse files
alegrmalegrm
committed
fixed limes, component-header and debian configuration
1 parent d5fd0eb commit 0fb0f00

File tree

14 files changed

+121
-142
lines changed

14 files changed

+121
-142
lines changed

‎pom.xml‎

Lines changed: 60 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
<scope>provided</scope>
4242
</dependency>
4343

44-
<dependency>
45-
<groupId>javax.el</groupId>
46-
<artifactId>javax.el-api</artifactId>
47-
<version>2.2.4</version>
48-
<scope>provided</scope>
49-
</dependency>
44+
<dependency>
45+
<groupId>javax.el</groupId>
46+
<artifactId>javax.el-api</artifactId>
47+
<version>2.2.4</version>
48+
<scope>provided</scope>
49+
</dependency>
5050

5151
<dependency>
5252
<groupId>commons-fileupload</groupId>
@@ -213,7 +213,7 @@
213213
<artifactId>tomcat7-maven-plugin</artifactId>
214214
<version>2.2</version>
215215
<configuration>
216-
<server>localhost</server>
216+
<server>generator</server>
217217
<url>${tomcat.deploy.url}</url>
218218
<path>/${project.build.finalName}</path>
219219
<update>true</update>
@@ -222,93 +222,65 @@
222222

223223
<!-- For creating the debian package -->
224224
<plugin>
225-
<artifactId>jdeb</artifactId>
226-
<groupId>org.vafer</groupId>
227-
<version>1.3</version>
228-
<executions>
229-
<execution>
230-
<phase>package</phase>
231-
<goals>
232-
<goal>jdeb</goal>
233-
</goals>
234-
<configuration>
235-
236-
<deb>${project.build.directory}/${project.artifactId}_${project.version}_all.deb</deb>
237-
<changesOut>${project.build.directory}/${project.artifactId}_${project.version}_all.changes</changesOut>
238-
239-
<dataSet>
240-
<data>
241-
<type>template</type>
242-
<paths>
243-
<path>/jobs</path>
244-
</paths>
245-
<mapper>
246-
<type>perm</type>
247-
<prefix>/var/generator</prefix>
248-
<user>tomcat7</user>
249-
<group>tomcat7</group>
250-
</mapper>
251-
</data>
252-
<data>
253-
<src>${project.build.directory}/${project.build.finalName}.war</src>
254-
<type>file</type>
255-
<mapper>
256-
<type>perm</type>
257-
<prefix>/var/lib/tomcat7/webapps</prefix>
258-
</mapper>
259-
</data>
260-
</dataSet>
261-
262-
<changesOut></changesOut>
263-
</configuration>
264-
</execution>
265-
</executions>
266-
</plugin>
267-
268-
<!-- To generate JAVA classes of the ontology models
269-
I tried to use this plugin to automatoicalluy create java clasess, but I didnt
270-
succeed in reading the configuration file
271-
<plugin>
272-
<groupId>org.apache.jena</groupId>
273-
<artifactId>jena-maven-tools</artifactId>
274-
<version>0.8</version>
275-
<configuration>
276-
<includes>
277-
<include>src/main/vocabs/framework-ontology_0.1.2.ttl</include>
278-
<include>src/main/vocabs/ldsi-schema_0.1.1.ttl</include>
279-
<include>src/main/vocabs/sparql-service-description.ttl</include>
280-
</includes>
281-
<fileOptions>
282-
<source>
283-
<input>src/main/vocabs/framework-ontology_0.1.2.ttl</input>
284-
<class-name>LDIWO</class-name>
285-
<config-file>src/main/vocabs/schemagen-config.xml</config-file>
286-
<output>src/main/java/com/ontos/ldiw/vocabulary</output>
287-
</source>
288-
<source>
289-
<input>src/main/vocabs/ldsi-schema_0.1.1.ttl</input>
290-
<class-name>LDIS</class-name>
291-
<package-name>com.ontos.ldiw.vocabulary</package-name>
292-
<output>src/main/java/com/ontos/ldiw/vocabulary</output>
293-
<ontology>true</ontology>
294-
</source>
295-
<source>
296-
<input>src/main/vocabs/sparql-service-description.ttl</input>
297-
<class-name>SD</class-name>
298-
<package-name>com.ontos.ldiw.vocabulary</package-name>
299-
<output>src/main/java/com/ontos/ldiw/vocabulary</output>
300-
</source>
301-
</fileOptions>
302-
</configuration>
225+
<artifactId>jdeb</artifactId>
226+
<groupId>org.vafer</groupId>
227+
<version>1.3</version>
303228
<executions>
304229
<execution>
305-
<id>schemagen</id>
230+
<phase>package</phase>
306231
<goals>
307-
<goal>translate</goal>
232+
<goal>jdeb</goal>
308233
</goals>
234+
<configuration>
235+
<deb>${project.build.directory}/${project.artifactId}_${project.version}_all.deb</deb>
236+
<changesOut>${project.build.directory}/${project.artifactId}_${project.version}_all.changes</changesOut>
237+
<signPackage>true</signPackage>
238+
<signMethod>dpkg-sig</signMethod>
239+
<signRole>builder</signRole>
240+
<dataSet>
241+
<data>
242+
<type>template</type>
243+
<paths>
244+
<path>/jobs</path>
245+
</paths>
246+
<mapper>
247+
<type>perm</type>
248+
<prefix>/var/generator</prefix>
249+
<user>tomcat7</user>
250+
<group>tomcat7</group>
251+
</mapper>
252+
</data>
253+
<data>
254+
<src>${project.build.directory}/${project.build.finalName}.war</src>
255+
<type>file</type>
256+
<mapper>
257+
<type>perm</type>
258+
<prefix>/var/lib/tomcat7/webapps</prefix>
259+
</mapper>
260+
</data>
261+
</dataSet>
262+
263+
<changesOut></changesOut>
264+
</configuration>
309265
</execution>
310266
</executions>
311-
</plugin> -->
267+
</plugin>
268+
269+
<!-- To generate JAVA classes of the ontology models I tried to use this
270+
plugin to automatoicalluy create java clasess, but I didnt succeed in reading
271+
the configuration file <plugin> <groupId>org.apache.jena</groupId> <artifactId>jena-maven-tools</artifactId>
272+
<version>0.8</version> <configuration> <includes> <include>src/main/vocabs/framework-ontology_0.1.2.ttl</include>
273+
<include>src/main/vocabs/ldsi-schema_0.1.1.ttl</include> <include>src/main/vocabs/sparql-service-description.ttl</include>
274+
</includes> <fileOptions> <source> <input>src/main/vocabs/framework-ontology_0.1.2.ttl</input>
275+
<class-name>LDIWO</class-name> <config-file>src/main/vocabs/schemagen-config.xml</config-file>
276+
<output>src/main/java/com/ontos/ldiw/vocabulary</output> </source> <source>
277+
<input>src/main/vocabs/ldsi-schema_0.1.1.ttl</input> <class-name>LDIS</class-name>
278+
<package-name>com.ontos.ldiw.vocabulary</package-name> <output>src/main/java/com/ontos/ldiw/vocabulary</output>
279+
<ontology>true</ontology> </source> <source> <input>src/main/vocabs/sparql-service-description.ttl</input>
280+
<class-name>SD</class-name> <package-name>com.ontos.ldiw.vocabulary</package-name>
281+
<output>src/main/java/com/ontos/ldiw/vocabulary</output> </source> </fileOptions>
282+
</configuration> <executions> <execution> <id>schemagen</id> <goals> <goal>translate</goal>
283+
</goals> </execution> </executions> </plugin> -->
312284
</plugins>
313285
</build>
314286

‎src/deb/control/control‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ Version: 1.2.0
33
Section: web
44
Priority: extra
55
Architecture: all
6-
Depends: oracle-java8-installer, tomcat7
6+
Depends: tomcat7,limes-service,deer-service,virtuoso-opensource,spring-batch-admin-geoknow,sparqlify-tomcat7,facete2-tomcat7,triplegeo-service
77
Maintainer: Alejandra Garcia-Rojas M <[email protected]>
8-
Distribution: development
8+
Distribution: ldstack-nightly
99
Homepage: http://stack.linkeddata.org/getting-started/geoknow-generator/
1010
Description: The GeoKnow Generator provides a workbench that integrates of tools
11-
developed within [GeoKnow project](http://geoknow.eu/),
12-
and are part of the [Linked Data Stack](http://stack.linkeddata.org/).
11+
developed within GeoKnow project (http://geoknow.eu/),
12+
and are part of the Linked Data Stack (http://stack.linkeddata.org/).
1313
These workbench aim to provide the required methods and tools
1414
to easly integrate and process geospatial data
1515
across a wide range of data sources on the web of data.

‎src/main/resources/log4j.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ log4j.appender.stdout.Target=System.out
77
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
88
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
99

10-
log4j.logger.eu.geoknow=DEBUG
10+
log4j.logger.eu.geoknow=INFO

‎src/main/webapp/js/services/co-evolution-service.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ module.factory("CoevolutionService", function ($http, ComponentsService, Ns, Con
1212
//success
1313
function(service){
1414
serviceUrl = service.serviceUrl;
15-
console.log(serviceUrl);
16-
return serviceUrl;
15+
return service;
1716
});
1817

1918
var getGroup = function(id){

‎src/main/webapp/js/workbench/classification-and-enrichment/deer-controller.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ var DeerCtrl = function($scope, $http, ConfigurationService, ComponentsService,
1515
//success
1616
function(response){
1717
$scope.component = response;
18-
$scope.sevice = ComponentsService.getComponentService(serviceUri, $scope.component);
19-
if($scope.sevice== null)
20-
flash.error="Service not configured: " +serviceUrl;
18+
$scope.service = ComponentsService.getComponentService(serviceUri, $scope.component);
19+
if($scope.service== null)
20+
flash.error="Service not configured: " + serviceUri;
2121
},
2222
function(response){
2323
flash.error="Component not configured: " +ServerErrorResponse.getMessage(response);
@@ -560,7 +560,7 @@ var DeerCtrl = function($scope, $http, ConfigurationService, ComponentsService,
560560

561561
$http({
562562
method: "POST",
563-
url: serviceUrl+"/LoadFile",
563+
url: $scope.service.serviceUrl+"/LoadFile",
564564
params: {
565565
configFile : configFile,
566566
dataFile: dataFile}
@@ -641,7 +641,7 @@ var DeerCtrl = function($scope, $http, ConfigurationService, ComponentsService,
641641
$scope.reviewForm = false;
642642

643643
$http({
644-
url: serviceUrl+"/GeoLiftRun",
644+
url: $scope.service.serviceUrl+"/GeoLiftRun",
645645
method: "POST",
646646
params: params,
647647
headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' }
@@ -658,7 +658,7 @@ var DeerCtrl = function($scope, $http, ConfigurationService, ComponentsService,
658658
$scope.showProgress = true;
659659

660660
$http({
661-
url: serviceUrl+"/GeoLiftReview",
661+
url: $scope.service.serviceUrl+"/GeoLiftReview",
662662
method: "POST",
663663
dataType: "json",
664664
contentType: "application/json; charset=utf-8"
@@ -690,7 +690,7 @@ var DeerCtrl = function($scope, $http, ConfigurationService, ComponentsService,
690690
};
691691

692692
$http({
693-
url: serviceUrl+"/ImportRDF",
693+
url: $scope.service.serviceUrl+"/ImportRDF",
694694
method: "POST",
695695
dataType: "json",
696696
params: parameters,

‎src/main/webapp/js/workbench/dashboard-controller.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
function DashboardCtrl($scope, JobService, ComponentsService, $http) {
44

55
var sbaUri ="http://generator.geoknow.eu/resource/SpringBatch";
6-
var sbaServiceUri = "http://generator.geoknow.eu/resource/SpringBatchService";
6+
var serviceUri = "http://generator.geoknow.eu/resource/SpringBatchService";
77

88
ComponentsService.getComponent(sbaUri).then(
99
//success
1010
function(response){
1111
$scope.sba = response;
12-
$scope.sbaService = ComponentsService.getComponentService(sbaServiceUri, $scope.sba);
13-
if($scope.sbaService== null)
14-
flash.error="Service not configured: " +sbaServiceUri;
12+
$scope.service = ComponentsService.getComponentService(serviceUri, $scope.sba);
13+
if($scope.service== null)
14+
flash.error="Service not configured: " +serviceUri;
1515
},
1616
function(response){
1717
flash.error="Component not configured: " +ServerErrorResponse.getMessage(response);

‎src/main/webapp/js/workbench/evolution-and-repair/coevolution-controller.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
'use strict';
22

3-
var CoevolutionCtrl = function($scope, $http, Ns, CoevolutionService, flash, ServerErrorResponse, GraphService){
4-
3+
var CoevolutionCtrl = function($scope, $http, Ns, CoevolutionService, ComponentsService, flash, ServerErrorResponse, GraphService){
4+
5+
6+
var serviceUri = "http://generator.geoknow.eu/resource/CoevolutionService";
57
CoevolutionService.getComponent().then(
68
//success
79
function(response){
810
$scope.component = response;
9-
$scope.sevice = CoevolutionService.serviceUrl;
11+
$scope.service = ComponentsService.getComponentService(serviceUri, $scope.component);
12+
if($scope.service== null)
13+
flash.error="Service not configured: " + serviceUri;
14+
1015
$scope.refreshGraphs();
1116
$scope.conflictResolutionStrategies = CoevolutionService.getConflictResolutionStrategies();
1217
init();

‎src/main/webapp/js/workbench/extraction-and-loading/import-rdf-controller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ var ImportFormCtrl = function($scope, $http, ConfigurationService, flash, Accoun
8080
if($scope.sourceType.value == 'file'){
8181
$scope.newTarget ={
8282
prefix : "RdfImport" ,
83-
label : "Import from file ",
83+
label : $scope.importRdf.source,
8484
description : "Import from file "+$scope.importRdf.source,
8585
};
8686
}

‎src/main/webapp/js/workbench/extraction-and-loading/sparqlify-controller.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ app.controller('SparqlifyCtrl', function($scope, ComponentsService) {
1515
//success
1616
function(response){
1717
$scope.component = response;
18-
$scope.sevice = ComponentsService.getComponentService(serviceUri, $scope.component);
19-
if($scope.sevice== null)
18+
$scope.service = ComponentsService.getComponentService(serviceUri, $scope.component);
19+
if($scope.service== null)
2020
flash.error="Service not configured: " +serviceUri;
2121
},
2222
function(response){
2323
flash.error="Component not configured: " +ServerErrorResponse.getMessage(response);
2424
});
2525

2626
$scope.openService = function(){
27-
window.open($scope.sevice.serviceUrl);
27+
window.open($scope.service.serviceUrl);
2828
return false;
2929
}
3030

‎src/main/webapp/js/workbench/extraction-and-loading/triplegeo-controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ var TripleGeoCtrl = function($scope, $http, ConfigurationService, ComponentsServ
1515
//success
1616
function(response){
1717
$scope.component = response;
18-
$scope.sevice = ComponentsService.getComponentService(serviceUri, $scope.component);
19-
if($scope.sevice== null)
18+
$scope.service = ComponentsService.getComponentService(serviceUri, $scope.component);
19+
if($scope.service== null)
2020
flash.error="Service not configured: " +serviceUri;
2121
},
2222
function(response){

0 commit comments

Comments
 (0)