You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/01/04 21:36:35 UTC
[6/6] jena git commit: Align to ARQ assembler utils improvements.
Align to ARQ assembler utils improvements.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/eb9eec04
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/eb9eec04
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/eb9eec04
Branch: refs/heads/master
Commit: eb9eec04301b9b739d79edc9ac684b6aa9415872
Parents: b4a6592
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jan 4 20:31:46 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jan 4 20:31:46 2016 +0000
----------------------------------------------------------------------
.../apache/jena/fuseki/build/FusekiConfig.java | 48 +++++++++++---------
1 file changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/eb9eec04/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
index 9100688..922d35b 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
@@ -50,7 +50,6 @@ import org.apache.jena.query.ReadWrite ;
import org.apache.jena.query.ResultSet ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.riot.Lang;
-import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
import org.apache.jena.update.UpdateAction ;
import org.apache.jena.update.UpdateFactory ;
@@ -77,10 +76,9 @@ public class FusekiConfig {
/** Has side effects in server setup */
public static List<DataAccessPoint> readConfigFile(String filename) {
// Old-style config file.
- Model model = RDFDataMgr.loadModel(filename) ;
+ Model model = readAssemblerFile(filename) ;
if ( model.size() == 0 )
return Collections.emptyList() ;
- additionalRDF(model) ;
server(model) ;
return servicesAndDatasets(model) ;
}
@@ -167,25 +165,32 @@ public class FusekiConfig {
}
}
- // XXX Move to utils
- private static Model additionalRDF(Model m) {
- SystemState.init$(); // Why? mvn jetty:run-war
- String x1 = StrUtils.strjoinNL
- ( SystemState.PREFIXES,
- "INSERT { [] ja:loadClass 'org.apache.jena.tdb.TDB' }",
- "WHERE { FILTER NOT EXISTS { [] ja:loadClass 'org.apache.jena.tdb.TDB' } }"
- ) ;
- String x2 = StrUtils.strjoinNL
- (SystemState.PREFIXES,
- "INSERT DATA {",
- " tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .",
- " tdb:GraphTDB rdfs:subClassOf ja:Model .",
- "}"
- ) ;
- execute(m, x1) ;
- execute(m, x2) ;
+ private static Model readAssemblerFile(String filename) {
+ Model m = AssemblerUtils.readAssemblerFile(filename) ;
+ // Any extras.
return m ;
}
+
+// // REMOVE THIS - now done by TDB itself.
+// private static Model additionalRDF(Model m) {
+// SystemState.init$(); // Why? mvn jetty:run-war
+//// // This should not be needed any more (jena system init)
+//// String x1 = StrUtils.strjoinNL
+//// ( SystemState.PREFIXES,
+//// "INSERT { [] ja:loadClass 'org.apache.jena.tdb.TDB' }",
+//// "WHERE { FILTER NOT EXISTS { [] ja:loadClass 'org.apache.jena.tdb.TDB' } }"
+//// ) ;
+//// String x2 = StrUtils.strjoinNL
+//// (SystemState.PREFIXES,
+//// "INSERT DATA {",
+//// " tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .",
+//// " tdb:GraphTDB rdfs:subClassOf ja:Model .",
+//// "}"
+//// ) ;
+//// execute(m, x1) ;
+//// execute(m, x2) ;
+// return m ;
+// }
private static void execute(Model m, String x) {
UpdateRequest req = UpdateFactory.create(x) ;
@@ -224,7 +229,7 @@ public class FusekiConfig {
for ( Path p : stream ) {
String fn = IRILib.filenameToIRI(p.toString()) ;
log.info("Load configuration: "+fn);
- Model m = RDFDataMgr.loadModel(fn) ;
+ Model m = readAssemblerFile(fn) ;
DataAccessPoint acc = readConfiguration(m) ;
dataServiceRef.add(acc) ;
}
@@ -235,7 +240,6 @@ public class FusekiConfig {
}
private static DataAccessPoint readConfiguration(Model m) {
- additionalRDF(m) ;
List<Resource> services = getByType(FusekiVocab.fusekiService, m) ;
if ( services.size() == 0 ) {