rvesse commented on code in PR #2773:
URL: https://github.com/apache/jena/pull/2773#discussion_r1799689714
##########
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java:
##########
@@ -299,32 +362,38 @@ protected void processModulesAndArgs() {
if ( getPositional().size() > 1 )
throw new CmdException("Multiple dataset path names given");
if ( getPositional().size() != 0 )
- serverConfig.datasetPath =
DataAccessPoint.canonical(getPositionalArg(0));
+ this.datasetPath =
DataAccessPoint.canonical(getPositionalArg(0));
}
- serverConfig.datasetDescription = "<unset>";
+ this.datasetDescription = "<unset>";
// ---- check: Invalid: --update + --conf
if ( contains(argUpdate) && contains(argConfig) )
throw new CmdException("--update and a configuration file does not
make sense (control using the configuration file only)");
- boolean allowUpdate = contains(argUpdate);
- serverConfig.allowUpdate = allowUpdate;
+ allowUpdate = contains(argUpdate);
boolean hasJettyConfigFile = contains(argJettyConfig);
+ if (hasJettyConfigFile) {
+ String jettyConfigFile = getValue(argJettyConfig);
+ if ( !FileOps.exists(jettyConfigFile)) {
+ throw new CmdException("Jetty config file not found: " +
jettyConfigFile);
+ }
+ builder.jettyServerConfig(jettyConfigFile);
+ }
// ---- Port
- serverConfig.port = defaultPort;
+ builder.port(defaultPort);
Review Comment:
- [ ] Don't set this default if a Jetty config file present
##########
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModule.java:
##########
@@ -56,7 +57,7 @@
* Modules must not rely on a call to {@code serverStopped} happening.</li>
* </ul>
*/
-public interface FusekiModule extends FusekiBuildCycle, FusekiStartStop,
FusekiActionCycle {
+public interface FusekiModule extends FusekiCliCustomiser, FusekiBuildCycle,
FusekiStartStop, FusekiActionCycle {
Review Comment:
- [ ] Remove this, doesn't make sense given the CLI lifecycle
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscr...@jena.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscr...@jena.apache.org
For additional commands, e-mail: pr-h...@jena.apache.org
