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 2014/03/31 22:15:23 UTC
svn commit: r1583437 - in /jena/Experimental/jena-fuseki2/src/main:
java/org/apache/jena/fuseki/build/ java/org/apache/jena/fuseki/mgt/
java/org/apache/jena/fuseki/server/
resources/org/apache/jena/fuseki/server/templates/
Author: andy
Date: Mon Mar 31 20:15:22 2014
New Revision: 1583437
URL: http://svn.apache.org/r1583437
Log:
Add FUSEKI_BASE, FUSEKI_HOME to template params; use for default TDB template
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
jena/Experimental/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java?rev=1583437&r1=1583436&r2=1583437&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java Mon Mar 31 20:15:22 2014
@@ -24,6 +24,7 @@ import java.util.Map ;
import org.apache.jena.fuseki.FusekiConfigException ;
import org.apache.jena.fuseki.server.DataService ;
+import org.apache.jena.fuseki.server.FusekiServer ;
import org.apache.jena.fuseki.server.FusekiVocab ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
@@ -42,6 +43,7 @@ public abstract class DataServiceDesc
public static DataServiceDesc createFromTemplate(String templateFile, String dbName) {
Map<String, String> params = new HashMap<>() ;
params.put(Template.NAME, dbName) ;
+ FusekiServer.addGlobals(params);
String template = TemplateFunctions.templateFile(templateFile, params) ;
Lang lang = RDFLanguages.filenameToLang(templateFile, Lang.TTL) ;
StringReader sr = new StringReader(template) ;
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java?rev=1583437&r1=1583436&r2=1583437&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java Mon Mar 31 20:15:22 2014
@@ -296,6 +296,7 @@ public class ActionDatasets extends Acti
String dbName = action.getRequest().getParameter(paramDatasetName) ;
Map<String, String> params = new HashMap<>() ;
params.put(Template.NAME, dbName) ;
+ FusekiServer.addGlobals(params);
action.log.info(format("[%d] Create database : name = %s, type = %s", action.id, dbName, dbType )) ;
if ( dbType == null || dbName == null )
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java?rev=1583437&r1=1583436&r2=1583437&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java Mon Mar 31 20:15:22 2014
@@ -304,6 +304,8 @@ public class FusekiServer
}
}
+ addGlobals(params);
+
String str = TemplateFunctions.templateFile(templateFile, params) ;
Lang lang = RDFLanguages.filenameToLang(str, Lang.TTL) ;
StringReader sr = new StringReader(str) ;
@@ -326,6 +328,14 @@ public class FusekiServer
return dap ;
}
+ public static void addGlobals(Map<String, String> params) {
+ if ( ! params.containsKey("FUSEKI_BASE") )
+ params.put("FUSEKI_BASE", FusekiServer.FUSEKI_BASE.toString()) ;
+ if ( ! params.containsKey("FUSEKI_HOME") )
+ params.put("FUSEKI_HOME", FusekiServer.FUSEKI_HOME.toString()) ;
+
+ }
+
// DRY -- ActionDatasets (and others?)
private static Statement getOne(Model m, Resource s, Property p, RDFNode o) {
StmtIterator iter = m.listStatements(s, p, o) ;
Modified: jena/Experimental/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb?rev=1583437&r1=1583436&r2=1583437&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb (original)
+++ jena/Experimental/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb Mon Mar 31 20:15:22 2014
@@ -30,7 +30,7 @@ tdb:GraphTDB rdfs:subClassOf ja:Mode
.
<#tdb_dataset_readwrite> rdf:type tdb:DatasetTDB ;
- tdb:location "databases/{NAME}" ;
+ tdb:location "{FUSEKI_BASE}/databases/{NAME}" ;
ja:context [ ja:cxtName "arq:queryTimeout" ; ja:cxtValue "3000" ] ;
##tdb:unionDefaultGraph true ;
.