[jena] branch main updated: JENA-2119: Restore read config from run/

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new 9b62c67  JENA-2119: Restore read config from run/
     new 7804fba  Merge pull request #1016 from afs/jena2119-read-config
9b62c67 is described below

commit 9b62c67e67126489bf3ca3e250379d3a4ba2318c
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Jun 17 17:00:59 2021 +0100

    JENA-2119: Restore read config from run/
---
 .../java/org/apache/jena/sparql/core/assembler/ViewGraphAssembler.java | 2 +-
 .../src/main/java/org/apache/jena/fuseki/webapp/FusekiWebapp.java      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/ViewGraphAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/ViewGraphAssembler.java
index f3d78cf..335c504 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/ViewGraphAssembler.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/ViewGraphAssembler.java
@@ -38,7 +38,7 @@ import org.apache.jena.rdf.model.Resource;
  * <pre>
  * &lt;#graph&gt; rdf:type ja:ViewGraph ;
  *     ja:graphName "..." ;            # Optional: else default graph
- *     js:dataset &lt;#dataset&gt; ;
+ *     ja:dataset &lt;#dataset&gt; ;
  *     .
  *  &lt;#dataset&gt; rdf:type ja:RDFDataset ; # Any subtype
  *    ...
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/FusekiWebapp.java b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/FusekiWebapp.java
index 69898fc..73ec2da 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/FusekiWebapp.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/FusekiWebapp.java
@@ -242,6 +242,9 @@ public class FusekiWebapp
         if ( params.fusekiCmdLineConfigFile != null ) {
             List<DataAccessPoint> confDatasets = processServerConfigFile(params.fusekiCmdLineConfigFile);
             datasets.addAll(confDatasets);
+        } else if ( params.fusekiServerConfigFile != null ) {
+                List<DataAccessPoint> confDatasets = processServerConfigFile(params.fusekiServerConfigFile);
+                datasets.addAll(confDatasets);
         } else if ( params.dsg != null ) {
             // RDFS
             if ( params.rdfsGraph != null ) {