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 2017/06/18 18:42:45 UTC
[4/5] jena git commit: Allow for read-only TDB dataset setup from the
command line.
Allow for read-only TDB dataset setup from the command line.
Maintain compatibility.
--conf is the better way to do it.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b4e44a9d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b4e44a9d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b4e44a9d
Branch: refs/heads/master
Commit: b4e44a9dfd11dbd5073e185581fc78a059bea628
Parents: 40e0470
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jun 18 18:44:43 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jun 18 18:44:43 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/build/Template.java | 1 +
.../src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b4e44a9d/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
index 27568d1..093b644 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
@@ -33,6 +33,7 @@ public class Template
public static final String templateTDBFN = templateDir+"/config-tdb" ;
public static final String templateTDBMemFN = templateDir+"/config-tdb-mem" ;
public static final String templateTDBDirFN = templateDir+"/config-tdb-dir" ;
+ public static final String templateTDBDirReadFN = templateDir+"/config-tdb-dir-read-only" ;
public static final String templateServiceFN = templateDir+"/config-service" ; // Dummy used by dataset-less service.
public static final String templateMemFN_1 = templateDir+"/config-mem-txn" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/b4e44a9d/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
index 24a3646..7277d50 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
@@ -268,7 +268,10 @@ public class FusekiCmd {
if ( contains(argTDB) ) {
cmdLineConfig.reset();
- cmdLineConfig.argTemplateFile = Template.templateTDBDirFN ;
+// cmdLineConfig.argTemplateFile =
+// cmdLineConfig.allowUpdate ? Template.templateTDBDirFN : Template.templateTDBDirReadFN;
+ // For a long time, "--update" did not apply here and so for compatibility ...
+ cmdLineConfig.argTemplateFile = Template.templateTDBDirFN;
String dir = getValue(argTDB) ;
cmdLineConfig.params.put(Template.DIR, dir) ;
cmdLineConfig.datasetDescription = "TDB dataset: "+dir;