Remove "pages" configuration setting (code uses a webapp area) Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e964aa56 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e964aa56 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e964aa56
Branch: refs/heads/master Commit: e964aa569221d250529398e7892a595c5c166d22 Parents: 1a613ff Author: Andy Seaborne <[email protected]> Authored: Wed Aug 3 23:57:32 2016 +0100 Committer: Andy Seaborne <[email protected]> Committed: Wed Aug 3 23:57:32 2016 +0100 ---------------------------------------------------------------------- .../org/apache/jena/fuseki/cmd/FusekiCmd.java | 24 ++++++-------------- .../jena/fuseki/jetty/JettyServerConfig.java | 15 ++++++++---- .../java/org/apache/jena/fuseki/ServerTest.java | 1 - 3 files changed, 17 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/e964aa56/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 4fa1249..2c93ec6 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 @@ -20,7 +20,6 @@ package org.apache.jena.fuseki.cmd ; import java.nio.file.Files ; import java.nio.file.Path ; -import java.util.List ; import arq.cmdline.CmdARQ ; import arq.cmdline.ModDatasetAssembler ; @@ -74,6 +73,7 @@ public class FusekiCmd { // --home :: Legacy - do not use. private static ArgDecl argHome = new ArgDecl(ArgDecl.HasValue, "home") ; + // --pages :: Legacy - do not use. private static ArgDecl argPages = new ArgDecl(ArgDecl.HasValue, "pages") ; private static ArgDecl argMem = new ArgDecl(ArgDecl.NoValue, "mem") ; @@ -107,7 +107,6 @@ public class FusekiCmd { jettyServerConfig.port = 3030 ; jettyServerConfig.contextPath = "/" ; jettyServerConfig.jettyConfigFile = null ; - jettyServerConfig.pages = Fuseki.PagesStatic ; jettyServerConfig.enableCompression = true ; jettyServerConfig.verboseLogging = false ; } @@ -133,8 +132,6 @@ public class FusekiCmd { "Create an in-memory, non-persistent dataset using TDB (testing only)") ; add(argPort, "--port", "Listen on this port number") ; - add(argPages, "--pages=DIR", - "Set of pages to serve as static content") ; // Set via jetty config file. add(argLocalhost, "--localhost", "Listen only on the localhost interface") ; @@ -147,6 +144,7 @@ public class FusekiCmd { add(argJettyConfig, "--jetty-config=FILE", "Set up the server (not services) with a Jetty XML file") ; add(argBasicAuth) ; + add(argPages) ; add(argMgt) ; // Legacy add(argMgtPort) ; // Legacy // add(argMgt, "--mgt", @@ -340,22 +338,14 @@ public class FusekiCmd { throw new CmdException("No such file: " + jettyServerConfig.jettyConfigFile) ; } - if ( contains(argBasicAuth) ) { - jettyServerConfig.authConfigFile = getValue(argBasicAuth) ; - if ( !FileOps.exists(jettyServerConfig.authConfigFile) ) - throw new CmdException("No such file: " + jettyServerConfig.authConfigFile) ; - } + if ( contains(argBasicAuth) ) + Fuseki.configLog.warn("--basic-auth ignored (use Shiro setup instead)") ; - if ( contains(argHome) ) { + if ( contains(argHome) ) Fuseki.configLog.warn("--home ignored (use enviroment variables $FUSEKI_HOME and $FUSEKI_BASE)") ; -// List<String> args = super.getValues(argHome) ; -// homeDir = args.get(args.size() - 1) ; - } - if ( contains(argPages) ) { - List<String> args = super.getValues(argPages) ; - jettyServerConfig.pages = args.get(args.size() - 1) ; - } + if ( contains(argPages) ) + Fuseki.configLog.warn("--pages ignored (enviroment variables $FUSEKI_HOME to provide the webapp)") ; if ( contains(argGZip) ) { if ( !hasValueOfTrue(argGZip) && !hasValueOfFalse(argGZip) ) http://git-wip-us.apache.org/repos/asf/jena/blob/e964aa56/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyServerConfig.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyServerConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyServerConfig.java index 71012ef..b7de091 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyServerConfig.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyServerConfig.java @@ -29,21 +29,26 @@ public class JettyServerConfig /** Port to run the server service on */ public int port ; - /** Port to run the server service on */ + + /** Path to run the server service under */ public String contextPath ; + /** Jetty config file - if null, use the built-in configuration of Jetty */ public String jettyConfigFile = null ; + /** Listen only on the loopback (localhost) interface */ public boolean loopback = false ; - /** The local directory for serving the static pages */ - public String pages ; + /** Enable Accept-Encoding compression. Set to false by default.*/ public boolean enableCompression = false ; /** Enable additional logging */ public boolean verboseLogging = false ; - /** - * Authentication config file used to setup Jetty Basic auth, if a Jetty config file was set this is ignored since Jetty config allows much more complex auth methods to be implemented + + /** Authentication config file used to setup Jetty Basic auth, + * if a Jetty config file was set this is ignored since Jetty config + * allows much more complex auth methods to be implemented. + * Using Apache Shiro is better as well. */ public String authConfigFile ; http://git-wip-us.apache.org/repos/asf/jena/blob/e964aa56/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java index 8e42a76..39591f0 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java @@ -139,7 +139,6 @@ public class ServerTest { config.contextPath = "/" ; config.loopback = listenLocal ; config.jettyConfigFile = null ; - config.pages = Fuseki.PagesStatic ; config.enableCompression = true ; config.verboseLogging = false ; return config ;
