This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
from 0bffdbcff0 GH-3682: Move jena-rdfcommons
new 5e8d2254f9 Test type: OmittedTest
new f90de90b39 Tidy up class Fuseki
new c185245d0e GH-3673: Rework Fuseki start-up
new 817728151e GH-3673: Revise the scripts (apache-jena-fuseki)
new f085da4b15 Align Dockerfile and log4j2.properties
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/jena/sparql/ARQConstants.java | 1 -
.../{SurpressedTest.java => OmittedTest.java} | 13 +-
.../apache/jena/arq/junit/sparql/SparqlTests.java | 24 +-
.../org/apache/jena/atlas/lib/DateTimeUtils.java | 29 +
.../org/apache/jena/cmd/TerminationException.java | 1 -
jena-fuseki2/apache-jena-fuseki/assembly-dist.xml | 10 +-
jena-fuseki2/apache-jena-fuseki/dist/LICENSE | 715 +++++++++++++--------
jena-fuseki2/apache-jena-fuseki/dist/README | 17 +-
jena-fuseki2/apache-jena-fuseki/fuseki-plain | 4 +-
jena-fuseki2/apache-jena-fuseki/fuseki-server | 27 +-
jena-fuseki2/apache-jena-fuseki/fuseki-server.bat | Bin 1192 -> 1196 bytes
.../{fuseki => service/fuseki.initd} | 32 +-
.../{ => service}/fuseki.service | 0
.../fuseki/access/TestSecurityFilterLocal.java | 6 +-
.../main/java/org/apache/jena/fuseki/Fuseki.java | 92 +--
.../org/apache/jena/fuseki/FusekiException.java | 4 +-
.../org/apache/jena/fuseki/ctl/ActionPing.java | 27 +-
.../apache/jena/fuseki/server/PlatformInfo.java | 106 ---
.../apache/jena/fuseki/servlets}/Servlet404.java | 2 +-
jena-fuseki2/jena-fuseki-docker/Dockerfile | 2 +-
jena-fuseki2/jena-fuseki-docker/log4j2.properties | 13 +-
.../jena/fuseki/main/FusekiAbortException.java | 37 +-
.../org/apache/jena/fuseki/main/FusekiMain.java | 103 +++
.../apache/jena/fuseki/main/FusekiMainRunner.java | 95 ---
.../org/apache/jena/fuseki/main/FusekiServer.java | 206 ++++--
.../jena/fuseki/main/cmds/ArgCustomisers.java | 70 --
.../{FusekiMainCmd.java => FusekiBasicCmd.java} | 21 +-
.../apache/jena/fuseki/main/cmds/FusekiCmd.java | 10 +-
.../jena/fuseki/main/cmds/FusekiMainCmd.java | 16 +-
.../jena/fuseki/main/cmds/FusekiServerCmd.java | 31 +-
...usekiMainCmd.java => FusekiServerPlainCmd.java} | 26 +-
...FusekiServerCmd.java => FusekiServerUICmd.java} | 18 +-
.../cmds/{FusekiServerCmd.java => RunFuseki.java} | 46 +-
.../jena/fuseki/main/runner/AbstractRunner.java | 121 ++++
.../fuseki/main/{cmds => runner}/DSGSetup.java | 11 +-
.../FusekiMain.java => runner/FusekiArgs.java} | 497 ++++++--------
.../fuseki/main/runner/FusekiBindException.java} | 21 +-
.../jena/fuseki/main/runner/FusekiRunner.java | 227 +++++++
.../FusekiRunnerLogging.java} | 61 +-
.../org/apache/jena/fuseki/main/runner/Runner.java | 60 ++
.../fuseki/main/{cmds => runner}/ServerArgs.java | 26 +-
.../fuseki/main/{cmds => runner}/SetupType.java | 2 +-
.../jena/fuseki/main/sys/FusekiAutoModules.java | 28 +-
.../jena/fuseki/main/sys/FusekiBuildCycle.java | 18 +-
.../jena/fuseki/main/sys}/FusekiCoreInfo.java | 24 +-
.../jena/fuseki/main/sys/FusekiErrorHandler.java | 3 +-
.../apache/jena/fuseki/main/sys/FusekiModule.java | 75 ++-
.../apache/jena/fuseki/main/sys/FusekiModules.java | 37 ++
...ustomiser.java => FusekiServerArgsHandler.java} | 32 +-
.../fuseki/main/sys/FusekiSystemConstants.java | 2 +-
.../apache/jena/fuseki/main/sys/PlatformInfo.java | 131 ++++
.../apache/jena/fuseki/mgt/FusekiServerCtl.java | 7 -
.../jena/fuseki/mod/FusekiServerModules.java | 42 --
.../apache/jena/fuseki/mod/admin/FMod_Admin.java | 34 +-
.../fuseki/mod/prometheus/FMod_Prometheus.java | 2 +-
.../apache/jena/fuseki/mod/shiro/FMod_Shiro.java | 130 ++--
.../{FusekiShiroLib.java => FusekiShiro.java} | 18 +-
.../mod/shiro/ShiroEnvironmentLoaderListener.java | 15 +-
.../jena/fuseki/mod/system/FMod_Compact.java | 29 +-
.../FMod_Ping.java} | 39 +-
.../apache/jena/fuseki/mod/system/FMod_Stats.java | 34 +-
.../apache/jena/fuseki/mod/system/FMod_Tasks.java | 37 +-
.../org/apache/jena/fuseki/mod/ui/FMod_UI.java | 4 +-
.../jena/fuseki/server/FusekiServerRunner.java | 136 ----
...ractTestAuth_JDK.java => AbstractTestAuth.java} | 2 +-
.../org/apache/jena/fuseki/main/TS_FusekiMain.java | 9 +-
.../{TestAuthQuery_JDK.java => TestAuthQuery.java} | 2 +-
...TestAuthUpdate_JDK.java => TestAuthUpdate.java} | 2 +-
.../apache/jena/fuseki/main/TestConfigFile.java | 2 +-
.../jena/fuseki/main/TestCrossOriginFilter.java | 6 +-
...sekiMainCmd.java => TestFusekiCmdLineArgs.java} | 9 +-
.../fuseki/main/TestFusekiMainCmdArguments.java | 7 +-
.../main/TestFusekiMainCmdCustomArguments.java | 71 +-
.../jena/fuseki/main/TestFusekiServerBuild.java | 22 +-
.../apache/jena/fuseki/main/TestFusekiStart.java | 156 +++++
.../main/runner/TestFusekiSetupInternal.java | 109 ++++
.../fuseki/main/sys/ModuleByServiceLoader.java | 2 +-
.../apache/jena/fuseki/main/sys/ModuleForTest.java | 83 ++-
.../jena/fuseki/main/sys/TestFusekiModules.java | 8 +-
.../org/apache/jena/fuseki/mod/TS_FusekiMods.java | 2 +-
.../fuseki/mod/admin/FusekiServerPerTestClass.java | 4 +-
.../fuseki/mod/admin/TestAdminDatabaseOps.java | 2 +
.../jena/fuseki/mod/metrics/TestModPrometheus.java | 2 +
.../apache/jena/fuseki/mod/shiro/TestModShiro.java | 10 +-
.../jena/fuseki/server/TestFusekiServer.java | 8 +-
.../jena/fuseki/server/TestFusekiServerCmd.java | 17 +-
.../fuseki/mod/geosparql/FMod_SpatialIndexer.java | 15 +-
.../mod/geosparql/TestFMod_SpatialIndexer.java | 12 +-
88 files changed, 2586 insertions(+), 1683 deletions(-)
copy jena-arq/src/test/java/org/apache/jena/arq/junit/{SurpressedTest.java =>
OmittedTest.java} (77%)
rename jena-fuseki2/apache-jena-fuseki/{fuseki => service/fuseki.initd} (92%)
mode change 100755 => 100644
rename jena-fuseki2/apache-jena-fuseki/{ => service}/fuseki.service (100%)
delete mode 100644
jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/PlatformInfo.java
rename
jena-fuseki2/{jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds
=>
jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets}/Servlet404.java
(98%)
copy jena-core/src/test/java/org/apache/jena/util/junit/TestException.java =>
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiAbortException.java
(55%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiMain.java
delete mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiMainRunner.java
delete mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ArgCustomisers.java
copy
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/{FusekiMainCmd.java
=> FusekiBasicCmd.java} (64%)
copy jena-langtag/src/main/java/module-info.java =>
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiCmd.java
(80%)
copy
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/{FusekiMainCmd.java
=> FusekiServerPlainCmd.java} (60%)
copy
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/{FusekiServerCmd.java
=> FusekiServerUICmd.java} (69%)
copy
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/{FusekiServerCmd.java
=> RunFuseki.java} (58%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/AbstractRunner.java
rename
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/{cmds
=> runner}/DSGSetup.java (93%)
rename
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/{cmds/FusekiMain.java
=> runner/FusekiArgs.java} (62%)
copy
jena-fuseki2/{jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiConfigException.java
=>
jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiBindException.java}
(65%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiRunner.java
rename
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/{FusekiRunner.java
=> runner/FusekiRunnerLogging.java} (51%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/Runner.java
rename
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/{cmds
=> runner}/ServerArgs.java (86%)
rename
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/{cmds
=> runner}/SetupType.java (96%)
rename
jena-fuseki2/{jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server =>
jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys}/FusekiCoreInfo.java
(80%)
rename
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/{FusekiServerArgsCustomiser.java
=> FusekiServerArgsHandler.java} (81%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/PlatformInfo.java
delete mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerModules.java
rename
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/shiro/{FusekiShiroLib.java
=> FusekiShiro.java} (83%)
copy
jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_TimezoneFromDateTime.java
=>
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Compact.java
(62%)
copy
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/{access/FMod_GraphAccessCtl.java
=> system/FMod_Ping.java} (50%)
copy
jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_TimezoneFromDateTime.java
=>
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Stats.java
(54%)
copy
jena-shex/src/main/java/org/apache/jena/shex/expressions/ShexPrintable.java =>
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Tasks.java
(57%)
delete mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/server/FusekiServerRunner.java
rename
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/{AbstractTestAuth_JDK.java
=> AbstractTestAuth.java} (98%)
rename
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/{TestAuthQuery_JDK.java
=> TestAuthQuery.java} (98%)
rename
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/{TestAuthUpdate_JDK.java
=> TestAuthUpdate.java} (98%)
rename
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/{TestFusekiMainCmd.java
=> TestFusekiCmdLineArgs.java} (95%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStart.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/runner/TestFusekiSetupInternal.java
