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

Commit d6aec5e

Browse files
author
taleksashina
committed
Merge remote-tracking branch 'remotes/origin/master' into geoknow (roles, intial setup)
1 parent a5d7806 commit d6aec5e

25 files changed

+217
-407
lines changed

‎src/main/java/authentication/web/GraphManagerServlet.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ else if (publicAccess.equals("acl:Write"))
256256
.getAuthSparqlEndpoint(), frameworkConfig.getAuthSparqlUser(), frameworkConfig
257257
.getAuthSparqlPassword());
258258
String query = "PREFIX sd: <http://www.w3.org/ns/sparql-service-description#>\n"
259-
+ "PREFIX gkg: <http://ldiw.ontos.com/ontology/>\n"
259+
+ "PREFIX gkg: <http://generator.geoknow.eu/ontology/>\n"
260260
+ "WITH <"
261261
+ settingsGraph
262262
+ "> "
@@ -274,7 +274,7 @@ else if (publicAccess.equals("acl:Write"))
274274
+ graph
275275
+ "> gkg:access ?s . ?s ?p ?o . } "
276276
+ " UNION "
277-
+ " {?s ?p ?o . FILTER (?s = <http://ldiw.ontos.com/resource/default-dataset> && ?p = sd:namedGraph && ?o = <"
277+
+ " {?s ?p ?o . FILTER (?s = <http://generator.geoknow.eu/resource/default-dataset> && ?p = sd:namedGraph && ?o = <"
278278
+ graph + ">) } " + "}";
279279
frameworkRdfStoreManager.execute(query, responseFormat);
280280
// remove graph from graph groups descriptions

‎src/main/java/authentication/web/RdfStoreProxy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
6666
String mode = req.getParameter("mode");
6767
String query = req.getParameter("query");
6868

69-
// System.out.println("mode " + mode);
70-
// System.out.println("username " + username);
69+
System.out.println("mode " + mode);
70+
System.out.println("username " + username);
7171

7272
try {
7373
RdfStoreManager rdfStoreManager;

‎src/main/java/setup/RDFStoreSetupManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public void setUp(FrameworkConfiguration config, boolean reset) throws Exception
179179

180180
//create users from framework configuration
181181
FrameworkUserManager frameworkUserManager = config.getFrameworkUserManager();
182-
String query = "PREFIX gkg: <http://ldiw.ontos.com/ontology/> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> "
182+
String query = "PREFIX gkg: <http://generator.geoknow.eu/ontology/> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> "
183183
+ " PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX lds: <http://stack.linkeddata.org/ldis-schema/> "
184184
+ " SELECT ?accountName ?password ?mailto ?role WHERE { ?account rdf:type gkg:Account . ?account foaf:accountName ?accountName . "
185185
+ " ?account lds:password ?password . ?account foaf:mbox ?mailto . ?account gkg:Role ?role . } ";

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

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@prefix : <http://ldiw.ontos.com/resource/> .
1+
@prefix : <http://generator.geoknow.eu/resource/> .
22
@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
33
@prefix dcmit: <http://purl.org/dc/dcmitype/> .
44
@prefix dcterms: <http://purl.org/dc/terms/> .
@@ -11,7 +11,7 @@
1111
@prefix void: <http://rdfs.org/ns/void#> .
1212
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
1313
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
14-
@prefix gkg: <http://ldiw.ontos.com/ontology/> .
14+
@prefix gkg: <http://generator.geoknow.eu/ontology/> .
1515
@prefix acl: <http://www.w3.org/ns/auth/acl#> .
1616

1717
########### ABOUT THIS FILE #############################################################
@@ -53,25 +53,6 @@
5353
lds:integrates :Facete, :Limes, :Sparqlify, :TripleGeo, :GeoLift, :OntoWiki, :Mappify ;
5454
foaf:homepage <http://localhost:8080/generator> .
5555

56-
:Virtuoso
57-
a lds:StackComponent ;
58-
rdfs:label "Service URL"^^xsd:string ;
59-
dcterms:hasVersion "7.0"^^xsd:string ;
60-
lds:providesService :VirtuosoConductor, :VirtuosoAuthSPARQLEndpoint, :VirtuosoEndpoint;
61-
foaf:homepage <http://virtuoso.openlinksw.com/> .
62-
63-
:VirtuosoConductor
64-
a lds:StorageService ;
65-
lds:serviceUrl <http://localhost:8890/conductor> .
66-
67-
:VirtuosoAuthSPARQLEndpoint
68-
a lds:SecuredSPARQLEndPointService ;
69-
lds:serviceUrl <http://localhost:8890/sparql-auth> .
70-
71-
:VirtuosoEndpoint
72-
a lds:SPARQLEndPointService ;
73-
lds:serviceUrl <http://localhost:8890/sparql> .
74-
7556
:Sparqlify
7657
a lds:StackComponent ;
7758
rdfs:label "Sparqlify"^^xsd:string ;
@@ -131,7 +112,7 @@
131112
foaf:homepage <http://aksw.org/Projects/OntoWiki.html> .
132113
:OntoWikiService
133114
a lds:AuthoringService ;
134-
lds:serviceUrl <http://localhost/ontowiki> .
115+
lds:serviceUrl <http://192.168.2.18/ontowiki> .
135116

136117
:Mappify
137118
a lds:StackComponent ;
@@ -143,26 +124,6 @@
143124
a lds:ExplorationService ;
144125
lds:serviceUrl <http://cstadler.aksw.org/mappify2/> .
145126

146-
:D2RQ
147-
a lds:StackComponent ;
148-
rdfs:label "D2RQ"^^xsd:string ;
149-
lds:providesService :D2RQService ;
150-
lds:version "0.1-SNAPSHOT"^^xsd:string .
151-
:D2RQService
152-
a lds:ExtractionService ;
153-
dcterms:description "Provides ontology create/upload/delete functionality"^^xsd:string ;
154-
lds:serviceUrl <http://localhost:8080/d2rq-mapper-web-service/api> .
155-
156-
:MiniDix
157-
a lds:StackComponent ;
158-
rdfs:label "MiniDix"^^xsd:string ;
159-
lds:providesService :MiniDixService ;
160-
lds:version "0.1-SNAPSHOT"^^xsd:string .
161-
:MiniDixService
162-
a lds:AuthoringService ;
163-
dcterms:description "Provides ontology edit functionality"^^xsd:string ;
164-
lds:serviceUrl <http://localhost:8080/minidix-web> .
165-
166127
:UserManager
167128
a lds:StackComponent ;
168129
rdfs:label "Users Manager"^^xsd:string ;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@prefix : <http://ldiw.ontos.com/resource/> .
1+
@prefix : <http://generator.geoknow.eu/resource/> .
22
@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
33
@prefix dcmit: <http://purl.org/dc/dcmitype/> .
44
@prefix dcterms: <http://purl.org/dc/terms/> .
@@ -11,7 +11,7 @@
1111
@prefix void: <http://rdfs.org/ns/void#> .
1212
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
1313
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
14-
@prefix gkg: <http://ldiw.ontos.com/ontology/> .
14+
@prefix gkg: <http://generator.geoknow.eu/ontology/> .
1515

1616

1717
########### ABOUT THIS FILE #############################################################

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# baseURI: http://ldiw.ontos.com/ontology/
1+
# baseURI: http://generator.geoknow.eu/ontology/
22

3-
@prefix : <http://ldiw.ontos.com/ontology/> .
3+
@prefix : <http://generator.geoknow.eu/ontology/> .
44
@prefix owl: <http://www.w3.org/2002/07/owl#> .
55
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
66
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -9,7 +9,7 @@
99
@prefix sd: <http://www.w3.org/ns/sparql-service-description#> .
1010
@prefix void: <http://rdfs.org/ns/void#> .
1111
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
12-
@prefix gkgres: <http://ldiw.ontos.com/resource/> .
12+
@prefix gkgres: <http://generator.geoknow.eu/resource/> .
1313
@prefix lds: <http://stack.linkeddata.org/ldis-schema/> .
1414

1515
: rdf:type owl:Ontology ;

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@
3333
<context-param>
3434
<description>Framework URI is used to get the configuration data from the framework-configuration.ttl file</description>
3535
<param-name>framework-uri</param-name>
36-
<param-value>http://ldiw.ontos.com/resource/GeoKnowGenerator</param-value>
36+
<param-value>http://generator.geoknow.eu/resource/GeoKnowGenerator</param-value>
3737
</context-param>
3838
<!-- Namespaces -->
3939
<context-param>
4040
<description>Framework Ontology Namespace</description>
4141
<param-name>framework-ontology-ns</param-name>
42-
<param-value>http://ldiw.ontos.com/ontology/</param-value>
42+
<param-value>http://generator.geoknow.eu/ontology/</param-value>
4343
</context-param>
4444
<context-param>
4545
<description>User Accounts Namespace</description>
4646
<param-name>accounts-ns</param-name>
47-
<param-value>http://ldiw.ontos.com/accounts/ontology/</param-value>
47+
<param-value>http://generator.geoknow.eu/accounts/ontology/</param-value>
4848
</context-param>
4949
<context-param>
5050
<description>Framework Default Namespace</description>
5151
<param-name>framework-ns</param-name>
52-
<param-value>http://ldiw.ontos.com/resource/</param-value>
52+
<param-value>http://generator.geoknow.eu/resource/</param-value>
5353
</context-param>
5454

5555

@@ -155,15 +155,6 @@
155155
<url-pattern>/UserManagerServlet</url-pattern>
156156
</servlet-mapping>
157157

158-
<servlet>
159-
<servlet-name>ExecuteD2RQTaskServlet</servlet-name>
160-
<servlet-class>ExecuteD2RQTaskServlet</servlet-class>
161-
</servlet>
162-
<servlet-mapping>
163-
<servlet-name>ExecuteD2RQTaskServlet</servlet-name>
164-
<url-pattern>/ExecuteD2RQTaskServlet</url-pattern>
165-
</servlet-mapping>
166-
167158
<servlet>
168159
<servlet-name>InitialSetup</servlet-name>
169160
<servlet-class>setup.InitialSetupServlet</servlet-class>

0 commit comments

Comments
 (0)