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

Commit bc51839

Browse files
author
taleksashina
committed
Merge remote-tracking branch 'remotes/origin/ontos-ldiw-acc' (roles, setup servlet, gui fixes)
1 parent 6d9e296 commit bc51839

22 files changed

+168
-752
lines changed

‎src/main/java/accounts/FrameworkUserManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ else if (predicate.endsWith("/settingsGraph"))
394394
else if (predicate.equals("http://xmlns.com/foaf/0.1/mbox")) {
395395
String mbox = bindingNode.path("o").path("value").getTextValue();
396396
userProfile.setEmail(mbox.substring("mailto:".length()));
397-
} else if (predicate.equals("http://ldiw.ontos.com/acc/ontology/role")) {
397+
} else if (predicate.equals(frameworkConfig.getFrameworkOntologyNS() + "role")) {
398398
String roleURI = bindingNode.path("o").path("value").getTextValue();
399399
UserRole role = getRole(roleURI);
400400
userProfile.setRole(role);
@@ -762,7 +762,7 @@ private UserRole getRole(String roleURI) throws Exception {
762762
String predicate = bindingNode.path("p").path("value").getTextValue();
763763
if (predicate.equals("http://xmlns.com/foaf/0.1/name"))
764764
role.setName(bindingNode.path("o").path("value").getTextValue());
765-
else if (predicate.equals("http://ldiw.ontos.com/acc/ontology/isAllowedToUseService"))
765+
else if (predicate.equals(frameworkConfig.getFrameworkOntologyNS() + "isAllowedToUseService"))
766766
roleServices.add(bindingNode.path("o").path("value").getTextValue());
767767
}
768768
role.setServices(roleServices);

‎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/acc/ontology/>\n"
259+
+ "PREFIX gkg: <http://ldiw.ontos.com/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/acc/resource/default-dataset> && ?p = sd:namedGraph && ?o = <"
277+
+ " {?s ?p ?o . FILTER (?s = <http://ldiw.ontos.com/resource/default-dataset> && ?p = sd:namedGraph && ?o = <"
278278
+ graph + ">) } " + "}";
279279
frameworkRdfStoreManager.execute(query, responseFormat);
280280
// remove graph from graph groups descriptions

‎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/acc/ontology/> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> "
182+
String query = "PREFIX gkg: <http://ldiw.ontos.com/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: 93 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@prefix : <http://ldiw.ontos.com/acc/resource/> .
1+
@prefix : <http://ldiw.ontos.com/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/acc/ontology/> .
14+
@prefix gkg: <http://ldiw.ontos.com/ontology/> .
1515
@prefix acl: <http://www.w3.org/ns/auth/acl#> .
1616

1717
########### ABOUT THIS FILE #############################################################
@@ -53,6 +53,96 @@
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+
75+
:Sparqlify
76+
a lds:StackComponent ;
77+
rdfs:label "Sparqlify"^^xsd:string ;
78+
lds:providesService :SparqlifyService ;
79+
lds:version "0.1-SNAPSHOT"^^xsd:string ;
80+
foaf:homepage <http://aksw.org/Projects/Sparqlify.html> .
81+
82+
:SparqlifyService
83+
a lds:ExplorationService ;
84+
lds:serviceUrl <http://localhost:8080/sparqlify/> .
85+
86+
:Facete
87+
a lds:StackComponent ;
88+
rdfs:label "Facete"^^xsd:string ;
89+
lds:providesService :FaceteService ;
90+
lds:version "0.1-SNAPSHOT"^^xsd:string ;
91+
foaf:homepage <http://aksw.org/Projects/Facete.html> .
92+
:FaceteService
93+
a lds:ExplorationService ;
94+
lds:serviceUrl <http://cstadler.aksw.org/facete2/> .
95+
96+
:Limes
97+
a lds:StackComponent ;
98+
rdfs:label "Limes Linking Service"^^xsd:string ;
99+
lds:providesService :LimesService;
100+
lds:version "0.6.4"^^xsd:string ;
101+
foaf:homepage <http://aksw.org/Projects/LIMES.html> .
102+
:LimesService
103+
a lds:InterlinkingService ;
104+
lds:serviceUrl <http://localhost:8080/Limes-Service> .
105+
106+
:TripleGeo
107+
a lds:StackComponent ;
108+
rdfs:label "TripleGeo"^^xsd:string ;
109+
lds:providesService :TripleGeoService ;
110+
lds:version "1.0"^^xsd:string ;
111+
foaf:homepage <https://web.imis.athena-innovation.gr/redmine/projects/geoknow_public/wiki/TripleGeo> .
112+
:TripleGeoService
113+
a lds:ExtractionService ;
114+
lds:serviceUrl <http://localhost:8080/TripleGeo-Service> .
115+
116+
:GeoLift
117+
a lds:StackComponent ;
118+
rdfs:label "GeoLift"^^xsd:string ;
119+
lds:providesService :GeoLiftService ;
120+
lds:version "0.6.4"^^xsd:string ;
121+
foaf:homepage <https://github.com/AKSW/GeoLift> .
122+
:GeoLiftService
123+
a lds:EnrichmentService ;
124+
lds:serviceUrl <http://localhost:8080/GeoLift-Service> .
125+
126+
:OntoWiki
127+
a lds:StackComponent ;
128+
rdfs:label "OntoWiki"^^xsd:string ;
129+
lds:providesService :OntoWikiService ;
130+
lds:version "0.9.10-1"^^xsd:string ;
131+
foaf:homepage <http://aksw.org/Projects/OntoWiki.html> .
132+
:OntoWikiService
133+
a lds:AuthoringService ;
134+
lds:serviceUrl <http://localhost/ontowiki> .
135+
136+
:Mappify
137+
a lds:StackComponent ;
138+
rdfs:label "Mappify"^^xsd:string ;
139+
lds:providesService :MappifyService ;
140+
lds:version "0.9.10-1"^^xsd:string ;
141+
foaf:homepage <https://github.com/GeoKnow/Mappify> .
142+
:MappifyService
143+
a lds:ExplorationService ;
144+
lds:serviceUrl <http://cstadler.aksw.org/mappify2/> .
145+
56146
:D2RQ
57147
a lds:StackComponent ;
58148
rdfs:label "D2RQ"^^xsd:string ;
@@ -70,39 +160,9 @@
70160
lds:version "0.1-SNAPSHOT"^^xsd:string .
71161
:MiniDixService
72162
a lds:AuthoringService ;
73-
dcterms:description "Provides thesaurus edit functionality"^^xsd:string ;
163+
dcterms:description "Provides ontology edit functionality"^^xsd:string ;
74164
lds:serviceUrl <http://localhost:8080/minidix-web> .
75165

76-
:Solr
77-
a lds:StackComponent ;
78-
rdfs:label "Solr"^^xsd:string ;
79-
lds:providesService :SearchService ;
80-
lds:version "4.8.1"^^xsd:string .
81-
:SearchService
82-
a lds:ExplorationService ;
83-
dcterms:description "Provides Solr Search."^^xsd:string ;
84-
lds:serviceUrl <http://localhost:8080/solr-search-ui> .
85-
86-
:DocumentComponent
87-
a lds:StackComponent ;
88-
rdfs:label "Documents Manager"^^xsd:string ;
89-
lds:providesService :DocumentUploadService ;
90-
lds:providesService :DocumentService ;
91-
lds:providesService :ReindexService ;
92-
lds:version "0.1-SNAPSHOT"^^xsd:string .
93-
:DocumentUploadService
94-
a lds:ExtractionService ;
95-
dcterms:description "Provides document upload functionality"^^xsd:string ;
96-
lds:serviceUrl <http://localhost:8080/SolrUploadProxy/proxy/upload/files> .
97-
:DocumentService
98-
a lds:AuthoringService ;
99-
dcterms:description "Provides documents view/edit functionality."^^xsd:string ;
100-
lds:serviceUrl <http://localhost:8080/SolrUploadProxy/proxy> .
101-
:ReindexService
102-
a lds:ExtractionService ;
103-
dcterms:description "Reindex all documents with current thesaurus."^^xsd:string ;
104-
lds:serviceUrl <http://localhost:8080/SolrUploadProxy/proxy/update/reindexWithNewThesaurus> .
105-
106166
:UserManager
107167
a lds:StackComponent ;
108168
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/acc/resource/> .
1+
@prefix : <http://ldiw.ontos.com/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/acc/ontology/> .
14+
@prefix gkg: <http://ldiw.ontos.com/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/acc/ontology/
1+
# baseURI: http://ldiw.ontos.com/ontology/
22

3-
@prefix : <http://ldiw.ontos.com/acc/ontology/> .
3+
@prefix : <http://ldiw.ontos.com/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/acc/resource/> .
12+
@prefix gkgres: <http://ldiw.ontos.com/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 & 4 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/acc/resource/GeoKnowGenerator</param-value>
36+
<param-value>http://ldiw.ontos.com/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/acc/ontology/</param-value>
42+
<param-value>http://ldiw.ontos.com/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/acc/accounts/ontology/</param-value>
47+
<param-value>http://ldiw.ontos.com/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/acc/resource/</param-value>
52+
<param-value>http://ldiw.ontos.com/resource/</param-value>
5353
</context-param>
5454

5555

‎src/main/webapp/css/app.css‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,6 @@ form{
350350
overflow: auto;
351351
}
352352

353-
/* Show jquery datepicker above dialogs */
354-
.ui-datepicker {
355-
z-index: 10000 !important;
356-
}
357-
358353
.lang-select {
359354
margin-top: 15px;
360355
margin-left: 15px;

0 commit comments

Comments
 (0)