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 d1525bf3b7 Bump cypress-vite from 1.5.0 to 1.6.0 in
/jena-fuseki2/jena-fuseki-ui
new f663f5161d GH-2902: Fuseki Server Modules
new a281c70fa2 Convert Fuseki-main tests to JUnit5
new 4f3ca09260 GH-2902: FusekiServerCtl - Code for server on-disk state
new 2a5223865b GH-2046: Add runtime new datasets to metrics
new b4fb486a2a GH-2902: Adjust command line args via customizer
new fcf9b5b831 GH-2902: Legacy entry points corresponding to
jena-fuseki-fulljar
new cc11cb656e Fix warnings
new d9c17fe8a4 Convert Fuseki-core tests to JUnit5
The 8 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/atlas/lib/FileOps.java | 3 +-
.../main/java/org/apache/jena/atlas/net/Host.java | 23 -
.../ext/xerces/util/DatatypeMessageFormatter.java | 23 +-
jena-fuseki2/jena-fuseki-core/pom.xml | 6 +
.../main/java/org/apache/jena/fuseki/Fuseki.java | 4 +
.../org/apache/jena/fuseki/build/FusekiConfig.java | 7 +-
.../org/apache/jena/fuseki/ctl/ActionMetrics.java | 11 +-
.../jena/fuseki/metrics/MetricsProvider.java | 44 +-
.../fuseki/metrics/MetricsProviderRegistry.java | 68 --
.../PrometheusMetricsProvider.java | 4 +-
.../jena/fuseki/metrics/SimpleMetricsProvider.java | 1 -
.../org/apache/jena/fuseki/server/Counter.java | 19 +-
.../apache/jena/fuseki/server/FusekiCoreInfo.java | 10 +-
.../apache/jena/fuseki/server/PlatformInfo.java | 18 +-
.../apache/jena/fuseki/servlets/HttpAction.java | 19 +
.../apache/jena/fuseki/system/DataUploader.java | 2 +-
.../apache/jena/fuseki/system/FusekiLogging.java | 7 +-
.../apache/jena/fuseki/system/spot/SpotTDB2.java | 1 -
.../org.apache.jena.sys.JenaSubsystemLifecycle | 1 -
.../java/org/apache/jena/fuseki/TS_FusekiCore.java | 14 +-
.../org/apache/jena/fuseki/TestValidators.java | 83 +-
.../fuseki/server/TestDatasetDescriptionMap.java | 6 +-
.../jena/fuseki/server/TestDispatchOnURI.java | 18 +-
.../UtilsTests.java => TestPrefixesCore.java} | 21 +-
.../jena/fuseki/servlets/prefixes/RegexTests.java | 44 --
.../org/apache/jena/fuseki/test/FusekiTest.java | 6 +-
.../java/org/apache/jena/fuseki/test/HttpTest.java | 18 +-
jena-fuseki2/jena-fuseki-main/pom.xml | 69 +-
.../jena/fuseki/authz/AuthorizationFilter403.java | 58 ++
.../org/apache/jena/fuseki/authz/DenyFilter.java | 0
.../apache/jena/fuseki/authz/LocalhostFilter.java | 71 ++
.../org/apache/jena/fuseki/cmd/FusekiCmd.java} | 24 +-
.../apache/jena/fuseki/cmd/FusekiWebappCmd.java} | 18 +-
.../apache/jena/fuseki/main/FusekiMainInfo.java | 61 --
.../org/apache/jena/fuseki/main/FusekiServer.java | 31 +-
.../apache/jena/fuseki/main/cmds/FusekiMain.java | 49 +-
.../jena/fuseki/main/cmds/FusekiServerCmd.java | 51 ++
.../apache/jena/fuseki/main/cmds/ServerArgs.java | 4 +-
.../jena/fuseki/main/sys/FusekiAutoModules.java | 232 ++----
.../apache/jena/fuseki/main/sys/FusekiModules.java | 14 +-
.../org/apache/jena/fuseki/mgt/ActionBackup.java | 0
.../apache/jena/fuseki/mgt/ActionBackupList.java | 94 +++
.../org/apache/jena/fuseki/mgt/ActionCompact.java} | 13 +-
.../org/apache/jena/fuseki/mgt/ActionDatasets.java | 481 ++++++++++++
.../org/apache/jena/fuseki/mgt/ActionLogs.java} | 41 +-
.../org/apache/jena/fuseki/mgt/ActionReload.java | 66 ++
.../java/org/apache/jena/fuseki/mgt/Backup.java | 122 +++
.../org/apache/jena/fuseki/mgt/FusekiAdmin.java} | 15 +-
.../apache/jena/fuseki/mgt/FusekiServerCtl.java | 435 +++++++++++
.../org/apache/jena/fuseki/mgt/ServerMgtConst.java | 41 +
.../java/org/apache/jena/fuseki/mgt/Template.java | 61 ++
.../apache/jena/fuseki/mgt/TemplateFunctions.java | 89 +++
.../apache/jena/fuseki/mod/FusekiServerRunner.java | 114 +++
.../fuseki/mod/access/FMod_GraphAccessCtl.java} | 24 +-
.../jena/fuseki/mod/admin/ActionServerStatus.java | 99 +++
.../apache/jena/fuseki/mod/admin/FMod_Admin.java | 193 +++++
.../jena/fuseki/mod/admin/LocalhostOnly.java | 94 +++
.../apache/jena/fuseki/mod/blank/FMod_BLANK.java | 43 ++
.../fuseki/mod/prometheus/FMod_Prometheus.java | 63 ++
.../mod}/prometheus/PrometheusMetricsProvider.java | 3 +-
.../apache/jena/fuseki/mod/shiro/FMod_Shiro.java | 186 +++++
.../jena/fuseki/mod/shiro/FusekiShiroLib.java | 65 ++
.../mod/shiro/ShiroEnvironmentLoaderListener.java | 77 ++
.../org/apache/jena/fuseki/mod/ui/ActionStats.java | 165 ++++
.../apache/jena/fuseki/mod/ui/ActionStatsTxt.java | 189 +++++
.../org/apache/jena/fuseki/mod/ui/FMod_UI.java | 199 +++++
.../org/apache/jena/fuseki/server/config.ttl | 2 +
.../org/apache/jena/fuseki/server/shiro.ini | 38 +
.../apache/jena/fuseki/server/templates/config-mem | 29 +
.../apache/jena/fuseki/server/templates/config-tdb | 32 +
.../jena/fuseki/server/templates/config-tdb-dir | 30 +
.../jena/fuseki/server/templates/config-tdb-mem | 30 +
.../jena/fuseki/server/templates/config-tdb2 | 32 +
.../jena/fuseki/server/templates/config-tdb2-dir | 31 +
.../jena/fuseki/server/templates/config-tdb2-mem | 30 +
.../org/apache/jena/fuseki/TC_FusekiServer.java} | 26 +-
.../jena/fuseki/main/AbstractFusekiTest.java | 9 +-
.../jena/fuseki/main/AbstractTestAuth_JDK.java | 9 +-
.../org/apache/jena/fuseki/main/FusekiTestLib.java | 2 +-
.../org/apache/jena/fuseki/main/TC_FusekiMain.java | 40 -
.../org/apache/jena/fuseki/main/TS_FusekiMain.java | 1 -
.../apache/jena/fuseki/main/TestAuthQuery_JDK.java | 2 +-
.../jena/fuseki/main/TestAuthUpdate_JDK.java | 2 +-
.../apache/jena/fuseki/main/TestConfigFile.java | 14 +-
.../jena/fuseki/main/TestCrossOriginFilter.java | 32 +-
.../apache/jena/fuseki/main/TestFileUpload.java | 4 +-
.../fuseki/main/TestFusekiCustomOperation.java | 28 +-
.../fuseki/main/TestFusekiCustomScriptFunc.java | 15 +-
.../jena/fuseki/main/TestFusekiDatasetSharing.java | 25 +-
.../apache/jena/fuseki/main/TestFusekiMainCmd.java | 8 +-
.../fuseki/main/TestFusekiMainCmdArguments.java | 47 +-
.../main/TestFusekiMainCmdCustomArguments.java | 14 +-
.../jena/fuseki/main/TestFusekiServerBuild.java | 4 +-
.../fuseki/main/TestFusekiShaclValidation.java | 15 +-
.../fuseki/main/TestFusekiStdReadOnlySetup.java | 10 +-
.../jena/fuseki/main/TestFusekiStdSetup.java | 10 +-
.../jena/fuseki/main/TestHttpOperations.java | 41 +-
.../apache/jena/fuseki/main/TestHttpOptions.java | 2 +-
.../org/apache/jena/fuseki/main/TestMetrics.java | 10 +-
.../jena/fuseki/main/TestMultipleEmbedded.java | 16 +-
.../apache/jena/fuseki/main/TestPatchFuseki.java | 8 +-
.../apache/jena/fuseki/main/TestPlainServer.java | 20 +-
.../org/apache/jena/fuseki/main/TestQuery.java | 35 +-
.../jena/fuseki/main/TestSPARQLProtocol.java | 11 +-
.../fuseki/main/TestSPARQLProtocolTimeout.java | 21 +-
.../AbstractTestFusekiSecurityAssembler.java | 16 +-
.../access/AbstractTestServiceDatasetAuth.java | 2 +-
.../jena/fuseki/main/access/AccessTestLib.java | 3 +-
.../jena/fuseki/main/access/TS_SecurityFuseki.java | 8 +-
.../jena/fuseki/main/access/TestAuthorized.java | 10 +-
.../jena/fuseki/main/access/TestPasswdOnly.java | 23 +-
.../main/access/TestSecurityBuilderSetup.java | 21 +-
.../fuseki/main/access/TestSecurityConfig.java | 7 +-
.../main/access/TestSecurityFilterFuseki.java | 256 ++++---
.../main/access/TestServiceDataAuthBuild.java | 10 +-
.../main/access/TestServiceDataAuthConfig.java | 11 +-
.../jena/fuseki/main/access/TestSimpleBearer.java | 7 +-
.../fuseki/main/prefixes/PrefixesServiceTests.java | 1 -
.../fuseki/main/sys/ModuleByServiceLoader.java | 1 +
.../apache/jena/fuseki/main/sys/ModuleForTest.java | 1 +
.../jena/fuseki/main/sys/TestFusekiModules.java | 79 +-
.../TS_FusekiMods.java} | 27 +-
.../apache/jena/fuseki/mod/TestFusekiServer.java | 96 +++
.../apache/jena/fuseki/mod/admin/TestAdmin.java | 840 +++++++++++++++++++++
.../jena/fuseki/mod/admin/TestFusekiReload.java | 169 +++++
.../fuseki/mod/admin/TestTemplateAddDataset.java | 183 +++++
.../metrics/TestModPrometheus.java} | 53 +-
.../apache/jena/fuseki/mod/shiro/TestModShiro.java | 214 ++++++
.../org.apache.jena.fuseki.main.sys.FusekiModule | 1 -
.../src/test/resources/log4j2-test.properties | 14 +-
.../testing/Config}/config-ds-bad-name-1.ttl | 0
.../testing/Config}/config-ds-bad-name-2.ttl | 0
.../testing/Config}/config-ds-bad-name-3.ttl | 0
.../testing/Config}/config-ds-bad-name-4.ttl | 0
.../testing/Config}/config-ds-inf.ttl | 0
.../testing/Config}/config-ds-plain-1.ttl | 0
.../testing/Config}/config-ds-plain-2.ttl | 0
.../testing/Config}/config-tdb2a.ttl | 0
.../testing/Config}/config-tdb2b.ttl | 0
.../testing/Shiro/shiro_localhost.ini | 13 +
.../testing/Shiro/shiro_userpassword.ini | 18 +
jena-fuseki2/jena-fuseki-server/pom.xml | 10 +-
jena-fuseki2/jena-fuseki-webapp/pom.xml | 18 +
.../jena/fuseki/webapp/FusekiServerListener.java | 8 +-
jena-fuseki2/pom.xml | 3 +-
.../shacl/validation/event/ValidationEvent.java | 2 +-
146 files changed, 5877 insertions(+), 1118 deletions(-)
delete mode 100644
jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/MetricsProviderRegistry.java
copy
jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/{prometheus
=> }/PrometheusMetricsProvider.java (93%)
delete mode 100644
jena-fuseki2/jena-fuseki-core/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle
rename
jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/servlets/{prefixes/UtilsTests.java
=> TestPrefixesCore.java} (89%)
delete mode 100644
jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/servlets/prefixes/RegexTests.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/authz/AuthorizationFilter403.java
copy jena-fuseki2/{jena-fuseki-webapp =>
jena-fuseki-main}/src/main/java/org/apache/jena/fuseki/authz/DenyFilter.java
(100%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/authz/LocalhostFilter.java
rename
jena-fuseki2/{jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/prometheus/InitPrometheus.java
=> jena-fuseki-main/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java}
(61%)
copy
jena-fuseki2/jena-fuseki-main/src/{test/java/org/apache/jena/fuseki/main/sys/LegacyModule.java
=> main/java/org/apache/jena/fuseki/cmd/FusekiWebappCmd.java} (61%)
delete mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiMainInfo.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerCmd.java
copy jena-fuseki2/{jena-fuseki-webapp =>
jena-fuseki-main}/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
(100%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ActionBackupList.java
copy
jena-fuseki2/jena-fuseki-main/src/{test/java/org/apache/jena/fuseki/main/sys/LegacyModule.java
=> main/java/org/apache/jena/fuseki/mgt/ActionCompact.java} (76%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
copy
jena-fuseki2/{jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionMetrics.java
=> jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ActionLogs.java}
(57%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ActionReload.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
copy
jena-fuseki2/jena-fuseki-main/src/{test/java/org/apache/jena/fuseki/main/sys/LegacyModule.java
=> main/java/org/apache/jena/fuseki/mgt/FusekiAdmin.java} (76%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/FusekiServerCtl.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ServerMgtConst.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/Template.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/TemplateFunctions.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java
rename
jena-fuseki2/jena-fuseki-main/src/{test/java/org/apache/jena/fuseki/main/sys/LegacyModule.java
=> main/java/org/apache/jena/fuseki/mod/access/FMod_GraphAccessCtl.java} (51%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/ActionServerStatus.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/FMod_Admin.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/LocalhostOnly.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/blank/FMod_BLANK.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/prometheus/FMod_Prometheus.java
rename
jena-fuseki2/{jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics =>
jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod}/prometheus/PrometheusMetricsProvider.java
(96%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/shiro/FMod_Shiro.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/shiro/FusekiShiroLib.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/shiro/ShiroEnvironmentLoaderListener.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/ui/ActionStats.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/ui/ActionStatsTxt.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/ui/FMod_UI.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/config.ttl
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/shiro.ini
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/templates/config-mem
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb-dir
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb-mem
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb2
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb2-dir
create mode 100644
jena-fuseki2/jena-fuseki-main/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb2-mem
rename
jena-fuseki2/{jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/UploadDetailsWithName.java
=> jena-fuseki-main/src/test/java/org/apache/jena/fuseki/TC_FusekiServer.java}
(65%)
delete mode 100644
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TC_FusekiMain.java
copy
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/{main/prefixes/PrefixesServiceTests.java
=> mod/TS_FusekiMods.java} (60%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/mod/TestFusekiServer.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/mod/admin/TestAdmin.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/mod/admin/TestFusekiReload.java
create mode 100644
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/mod/admin/TestTemplateAddDataset.java
copy
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/{main/TestMetrics.java
=> mod/metrics/TestModPrometheus.java} (50%)
create mode 100644
jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/mod/shiro/TestModShiro.java
delete mode 100644
jena-fuseki2/jena-fuseki-main/src/test/resources/META-INF/services/org.apache.jena.fuseki.main.sys.FusekiModule
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-ds-bad-name-1.ttl (100%)
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-ds-bad-name-2.ttl (100%)
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-ds-bad-name-3.ttl (100%)
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-ds-bad-name-4.ttl (100%)
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-ds-inf.ttl (100%)
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-ds-plain-1.ttl (100%)
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-ds-plain-2.ttl (100%)
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-tdb2a.ttl (100%)
copy jena-fuseki2/{jena-fuseki-webapp/testing =>
jena-fuseki-main/testing/Config}/config-tdb2b.ttl (100%)
create mode 100644
jena-fuseki2/jena-fuseki-main/testing/Shiro/shiro_localhost.ini
create mode 100644
jena-fuseki2/jena-fuseki-main/testing/Shiro/shiro_userpassword.ini
