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

commit 817728151e259ad49b8d0fb972a881c69de04344
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat Jan 3 13:06:41 2026 +0000

    GH-3673: Revise the scripts (apache-jena-fuseki)
---
 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      |  33 +-
 jena-fuseki2/apache-jena-fuseki/fuseki-server.bat  | Bin 1192 -> 1196 bytes
 .../{fuseki => service/fuseki.initd}               |  32 +-
 .../{ => service}/fuseki.service                   |   0
 jena-fuseki2/jena-fuseki-server/pom.xml            |   2 +-
 9 files changed, 510 insertions(+), 303 deletions(-)

diff --git a/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml 
b/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
index 438adc0ed3..e36c85f906 100644
--- a/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
+++ b/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
@@ -65,7 +65,6 @@
       <outputDirectory></outputDirectory>
       <includes>
         <include>log4j2.properties</include>
-        <include>fuseki</include>
         <include>fuseki.service</include>
         <include>fuseki-server.bat</include>
       </includes>
@@ -77,9 +76,18 @@
       <fileMode>0755</fileMode>
       <includes>
         <include>fuseki-server</include>
+        <include>fuseki-plain</include>
         <include>fuseki-backup</include>
       </includes>
     </fileSet>
+
+    <fileSet>
+      <outputDirectory>service/</outputDirectory>
+      <includes>
+        <include>service/fuseki.service</include>
+        <include>service/fuseki.initd</include>
+      </includes>
+    </fileSet>
     
   </fileSets>
 </assembly>
diff --git a/jena-fuseki2/apache-jena-fuseki/dist/LICENSE 
b/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
index 0e1a175f0c..69a4b4e1ec 100644
--- a/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
+++ b/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
@@ -547,271 +547,450 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ## Output of 'yarn licenses list --prod'
 
-yarn licenses v1.22.15
-+- (CC-BY-4.0 AND MIT)
-|  +- @fortawesome/[email protected]
-|  |  +- URL: https://github.com/FortAwesome/Font-Awesome
-|  |  +- VendorName: Dave Gandy
-|  |  \- VendorUrl: https://fontawesome.com/
-|  \- @fortawesome/[email protected]
-|     +- URL: https://github.com/FortAwesome/Font-Awesome
-|     +- VendorName: Dave Gandy
-|     \- VendorUrl: https://fontawesome.com/
-+- Apache-2.0
-|  \- [email protected]
-|     +- URL: git+https://github.com/lian-yue/vue-upload-component.git
-|     +- VendorName: LianYue
-|     \- VendorUrl: https://github.com/lian-yue/vue-upload-component#readme
-+- BSD-3-Clause
-|  +- [email protected]
-|  |  +- URL: https://github.com/MonsantoCo/column-resizer.git
-|  |  \- VendorName: John Glynn
-|  \- [email protected]
-|     +- URL: https://github.com/ljharb/qs.git
-|     \- VendorUrl: https://github.com/ljharb/qs
-+- CC0-1.0
-|  \- [email protected]
-|     +- URL: git://github.com/darkskyapp/string-hash.git
-|     \- VendorName: The Dark Sky Company
-+- ISC
-|  +- [email protected]
-|  |  \- URL: git://github.com/isaacs/inherits
-|  \- [email protected]
-|     \- URL: https://github.com/npm/node-semver
-+- MIT
-|  +- @fortawesome/[email protected]
-|  |  +- URL: https://github.com/FortAwesome/Font-Awesome
-|  |  +- VendorName: Dave Gandy
-|  |  \- VendorUrl: https://fontawesome.com/
-|  +- @fortawesome/[email protected]
-|  |  +- URL: https://github.com/FortAwesome/Font-Awesome
-|  |  +- VendorName: Dave Gandy
-|  |  \- VendorUrl: https://fontawesome.com/
-|  +- @fortawesome/[email protected]
-|  |  +- URL: https://github.com/FortAwesome/Font-Awesome
-|  |  +- VendorName: Dave Gandy
-|  |  \- VendorUrl: https://fontawesome.com/
-|  +- @fortawesome/[email protected]
-|  |  +- URL: https://github.com/FortAwesome/vue-fontawesome.git
-|  |  \- VendorUrl: https://github.com/FortAwesome/vue-fontawesome
-|  +- @nuxt/[email protected]
-|  |  \- URL: https://github.com/nuxt-contrib/opencollective.git
-|  +- @triply/[email protected]
-|  |  +- URL: https://github.com/TriplyDB/yasgui.git
-|  |  +- VendorName: Triply
-|  |  \- VendorUrl: https://github.com/TriplyDB/yasgui
-|  +- @triply/[email protected]
-|  |  +- URL: https://github.com/TriplyDB/yasgui.git
-|  |  +- VendorName: Triply
-|  |  \- VendorUrl: https://github.com/TriplyDB/yasgui
-|  +- @triply/[email protected]
-|  |  +- URL: https://github.com/TriplyDB/yasgui.git
-|  |  +- VendorName: Triply
-|  |  \- VendorUrl: https://github.com/TriplyDB/yasgui
-|  +- @types/[email protected]
-|  |  \- URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git
-|  +- @types/[email protected]
-|  |  \- URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git
-|  +- @types/[email protected]
-|  |  \- URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git
-|  +- @types/[email protected]
-|  |  \- URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git
-|  +- [email protected]
-|  |  +- URL: https://github.com/chalk/ansi-styles.git
-|  |  +- VendorName: Sindre Sorhus
-|  |  \- VendorUrl: sindresorhus.com
-|  +- [email protected]
-|  |  +- URL: git+https://github.com/alexindigo/asynckit.git
-|  |  +- VendorName: Alex Indigo
-|  |  \- VendorUrl: https://github.com/alexindigo/asynckit#readme
-|  +- [email protected]
-|  |  +- URL: https://github.com/axios/axios.git
-|  |  +- VendorName: Matt Zabriskie
-|  |  \- VendorUrl: https://github.com/axios/axios
-|  +- [email protected]
-|  |  +- URL: https://github.com/bootstrap-vue/bootstrap-vue.git
-|  |  \- VendorUrl: https://bootstrap-vue.org/
-|  +- [email protected]
-|  |  +- URL: git+https://github.com/twbs/bootstrap.git
-|  |  +- VendorName: The Bootstrap Authors
-|  |  \- VendorUrl: https://getbootstrap.com/
-|  +- [email protected]
-|  |  \- URL: https://github.com/chalk/chalk.git
-|  +- [email protected]
-|  |  +- URL: https://github.com/codemirror/CodeMirror.git
-|  |  +- VendorName: Marijn Haverbeke
-|  |  \- VendorUrl: https://codemirror.net/
-|  +- [email protected]
-|  |  +- URL: https://github.com/Qix-/color-convert.git
-|  |  \- VendorName: Heather Arthur
-|  +- [email protected]
-|  |  +- URL: [email protected]:colorjs/color-name.git
-|  |  +- VendorName: DY
-|  |  \- VendorUrl: https://github.com/colorjs/color-name
-|  +- [email protected]
-|  |  +- URL: http://github.com/Marak/colors.js.git
-|  |  +- VendorName: Marak Squires
-|  |  \- VendorUrl: https://github.com/Marak/colors.js
-|  +- [email protected]
-|  |  +- URL: git://github.com/felixge/node-combined-stream.git
-|  |  +- VendorName: Felix Geisendörfer
-|  |  \- VendorUrl: https://github.com/felixge/node-combined-stream
-|  +- [email protected]
-|  |  +- URL: https://github.com/tj/commander.js.git
-|  |  \- VendorName: TJ Holowaychuk
-|  +- [email protected]
-|  |  \- URL: https://github.com/component/emitter.git
-|  +- [email protected]
-|  |  \- URL: https://github.com/nuxt/consola.git
-|  +- [email protected]
-|  |  +- URL: https://github.com/bmeck/node-cookiejar.git
-|  |  \- VendorName: bradleymeck
-|  +- [email protected]
-|  |  \- URL: https://github.com/zloirock/core-js.git
-|  +- [email protected]
-|  |  +- URL: https://github.com/DataTables/Dist-DataTables-DataTables.git
-|  |  +- VendorName: SpryMedia Ltd
-|  |  \- VendorUrl: https://datatables.net/
-|  +- [email protected]
-|  |  +- URL: https://github.com/DataTables/Dist-DataTables.git
-|  |  +- VendorName: SpryMedia Ltd
-|  |  \- VendorUrl: https://datatables.net/
-|  +- [email protected]
-|  |  +- URL: git://github.com/visionmedia/debug.git
-|  |  \- VendorName: TJ Holowaychuk
-|  +- [email protected]
-|  |  +- URL: https://github.com/SamVerschueren/decode-uri-component.git
-|  |  +- VendorName: Sam Verschueren
-|  |  \- VendorUrl: github.com/SamVerschueren
-|  +- [email protected]
-|  |  +- URL: git://github.com/felixge/node-delayed-stream.git
-|  |  +- VendorName: Felix Geisendörfer
-|  |  \- VendorUrl: https://github.com/felixge/node-delayed-stream
-|  +- [email protected]
-|  |  +- URL: git+https://github.com/davidmarkclements/fast-safe-stringify.git
-|  |  +- VendorName: David Mark Clements
-|  |  \- VendorUrl: 
https://github.com/davidmarkclements/fast-safe-stringify#readme
-|  +- [email protected]
-|  |  +- URL: [email protected]:follow-redirects/follow-redirects.git
-|  |  +- VendorName: Ruben Verborgh
-|  |  \- VendorUrl: https://github.com/follow-redirects/follow-redirects
-|  +- [email protected]
-|  |  +- URL: git://github.com/form-data/form-data.git
-|  |  +- VendorName: Felix Geisendörfer
-|  |  \- VendorUrl: http://debuggable.com/
-|  +- [email protected]
-|  |  +- URL: https://github.com/node-formidable/formidable.git
-|  |  \- VendorUrl: https://github.com/node-formidable/formidable
-|  +- [email protected]
-|  |  +- URL: https://github.com/sindresorhus/has-flag.git
-|  |  +- VendorName: Sindre Sorhus
-|  |  \- VendorUrl: sindresorhus.com
-|  +- [email protected]
-|  |  +- URL: https://github.com/jquery/jquery.git
-|  |  +- VendorName: JS Foundation and other contributors
-|  |  \- VendorUrl: https://jquery.com/
-|  +- [email protected]
-|  |  +- URL: https://github.com/zemirco/json2csv
-|  |  +- VendorName: Mirco Zeiss
-|  |  \- VendorUrl: http://zemirco.github.io/json2csv
-|  +- [email protected]
-|  |  +- URL: http://github.com/creationix/jsonparse.git
-|  |  \- VendorName: Tim Caswell
-|  +- [email protected]
-|  |  +- URL: https://github.com/lodash/lodash.git
-|  |  +- VendorName: John-David Dalton
-|  |  \- VendorUrl: https://lodash.com/custom-builds
-|  +- [email protected]
-|  |  +- URL: https://github.com/lodash/lodash.git
-|  |  +- VendorName: John-David Dalton
-|  |  \- VendorUrl: https://lodash.com/
-|  +- [email protected]
-|  |  \- URL: https://github.com/jshttp/methods.git
-|  +- [email protected]
-|  |  \- URL: https://github.com/jshttp/mime-db.git
-|  +- [email protected]
-|  |  \- URL: https://github.com/jshttp/mime-types.git
-|  +- [email protected]
-|  |  +- URL: https://github.com/broofa/mime
-|  |  +- VendorName: Robert Kieffer
-|  |  \- VendorUrl: http://github.com/broofa
-|  +- [email protected]
-|  |  \- URL: https://github.com/zeit/ms.git
-|  +- [email protected]
-|  |  +- URL: https://github.com/rdfjs/N3.js.git
-|  |  \- VendorName: Ruben Verborgh
-|  +- [email protected]
-|  |  +- URL: https://github.com/bitinn/node-fetch.git
-|  |  +- VendorName: David Frank
-|  |  \- VendorUrl: https://github.com/bitinn/node-fetch
-|  +- [email protected]
-|  |  +- URL: git+https://github.com/FezVrasta/popper.js.git
-|  |  +- VendorName: Federico Zivolo
-|  |  \- VendorUrl: https://popper.js.org/
-|  +- [email protected]
-|  |  +- URL: https://github.com/LinusBorg/portal-vue
-|  |  +- VendorName: Thorsten Lünborg
-|  |  \- VendorUrl: htps://github.com/LinusBorg/
-|  +- [email protected]
-|  |  +- URL: https://github.com/sindresorhus/query-string.git
-|  |  +- VendorName: Sindre Sorhus
-|  |  \- VendorUrl: https://sindresorhus.com
-|  +- [email protected]
-|  |  +- URL: git://github.com/feross/queue-microtask.git
-|  |  +- VendorName: Feross Aboukhadijeh
-|  |  \- VendorUrl: https://github.com/feross/queue-microtask
-|  +- [email protected]
-|  |  \- URL: git://github.com/nodejs/readable-stream
-|  +- [email protected]
-|  |  +- URL: git://github.com/feross/safe-buffer.git
-|  |  +- VendorName: Feross Aboukhadijeh
-|  |  \- VendorUrl: https://github.com/feross/safe-buffer
-|  +- [email protected]
-|  |  +- URL: https://github.com/sindresorhus/split-on-first.git
-|  |  +- VendorName: Sindre Sorhus
-|  |  \- VendorUrl: sindresorhus.com
-|  +- [email protected]
-|  |  +- URL: git://github.com/marcuswestin/store.js.git
-|  |  +- VendorName: Marcus Westin
-|  |  \- VendorUrl: https://github.com/marcuswestin/store.js#readme
-|  +- [email protected]
-|  |  +- URL: https://github.com/kevva/strict-uri-encode.git
-|  |  +- VendorName: Kevin Mårtensson
-|  |  \- VendorUrl: github.com/kevva
-|  +- [email protected]
-|  |  +- URL: git://github.com/nodejs/string_decoder.git
-|  |  \- VendorUrl: https://github.com/nodejs/string_decoder
-|  +- [email protected]
-|  |  +- URL: git://github.com/visionmedia/superagent.git
-|  |  +- VendorName: TJ Holowaychuk
-|  |  \- VendorUrl: https://github.com/visionmedia/superagent
-|  +- [email protected]
-|  |  +- URL: https://github.com/chalk/supports-color.git
-|  |  +- VendorName: Sindre Sorhus
-|  |  \- VendorUrl: sindresorhus.com
-|  +- [email protected]
-|  |  +- URL: git://github.com/TooTallNate/util-deprecate.git
-|  |  +- VendorName: Nathan Rajlich
-|  |  \- VendorUrl: https://github.com/TooTallNate/util-deprecate
-|  +- [email protected]
-|  |  +- URL: 
git+https://github.com/alexsasharegan/vue-functional-data-merge.git
-|  |  +- VendorName: Alex Regan
-|  |  \- VendorUrl: 
https://github.com/alexsasharegan/vue-functional-data-merge#readme
-|  +- [email protected]
-|  |  +- URL: https://github.com/vuejs/vue-router.git
-|  |  +- VendorName: Evan You
-|  |  \- VendorUrl: https://github.com/vuejs/vue-router#readme
-|  +- [email protected]
-|  |  +- URL: git+https://github.com/vuejs/vue.git
-|  |  +- VendorName: Evan You
-|  |  \- VendorUrl: https://github.com/vuejs/vue#readme
-|  \- [email protected]
-|     +- URL: git+https://github.com/vuejs/vuex.git
-|     +- VendorName: Evan You
-|     \- VendorUrl: https://github.com/vuejs/vuex#readme
-\- MPL-2.0 OR Apache-2.0
-   \- [email protected]
-      +- URL: git://github.com/cure53/DOMPurify.git
-      +- VendorName: Mario Heiderich
-      \- VendorUrl: https://github.com/cure53/DOMPurify
-
+yarn licenses v1.22.22
+├─ (CC-BY-4.0 AND MIT)
+│  ├─ @fortawesome/[email protected]
+│  │  ├─ URL: https://github.com/FortAwesome/Font-Awesome
+│  │  ├─ VendorName: Dave Gandy
+│  │  └─ VendorUrl: https://fontawesome.com/
+│  └─ @fortawesome/[email protected]
+│     ├─ URL: https://github.com/FortAwesome/Font-Awesome
+│     ├─ VendorName: The Font Awesome Team
+│     └─ VendorUrl: https://fontawesome.com/
+├─ (MPL-2.0 OR Apache-2.0)
+│  └─ [email protected]
+│     ├─ URL: git://github.com/cure53/DOMPurify.git
+│     ├─ VendorName: Dr.-Ing. Mario Heiderich, Cure53
+│     └─ VendorUrl: https://github.com/cure53/DOMPurify
+├─ Apache-2.0
+│  └─ [email protected]
+│     ├─ URL: git+https://github.com/lian-yue/vue-upload-component.git
+│     ├─ VendorName: LianYue
+│     └─ VendorUrl: https://github.com/lian-yue/vue-upload-component#readme
+├─ BSD-2-Clause
+│  └─ [email protected]
+│     ├─ URL: https://github.com/fb55/entities.git
+│     └─ VendorName: Felix Boehm
+├─ BSD-3-Clause
+│  ├─ [email protected]
+│  │  ├─ URL: https://github.com/jglynn43/column-resizer.git
+│  │  └─ VendorName: John Glynn
+│  ├─ [email protected]
+│  │  ├─ URL: git://github.com/feross/ieee754.git
+│  │  ├─ VendorName: Feross Aboukhadijeh
+│  │  └─ VendorUrl: https://feross.org
+│  ├─ [email protected]
+│  │  ├─ URL: https://github.com/ljharb/qs.git
+│  │  └─ VendorUrl: https://github.com/ljharb/qs
+│  └─ [email protected]
+│     ├─ URL: https://github.com/7rulnik/source-map-js.git
+│     ├─ VendorName: Valentin 7rulnik Semirulnik
+│     └─ VendorUrl: https://github.com/7rulnik/source-map-js
+├─ CC0-1.0
+│  └─ [email protected]
+│     ├─ URL: git://github.com/darkskyapp/string-hash.git
+│     └─ VendorName: The Dark Sky Company
+├─ ISC
+│  └─ [email protected]
+│     ├─ URL: https://github.com/alexeyraspopov/picocolors.git
+│     └─ VendorName: Alexey Raspopov
+└─ MIT
+   ├─ @babel/[email protected]
+   │  ├─ URL: https://github.com/babel/babel.git
+   │  ├─ VendorName: The Babel Team
+   │  └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-string-parser
+   ├─ @babel/[email protected]
+   │  ├─ URL: https://github.com/babel/babel.git
+   │  ├─ VendorName: The Babel Team
+   │  └─ VendorUrl: https://babel.dev/team
+   ├─ @babel/[email protected]
+   │  ├─ URL: https://github.com/babel/babel.git
+   │  ├─ VendorName: The Babel Team
+   │  └─ VendorUrl: https://babel.dev/docs/en/next/babel-parser
+   ├─ @babel/[email protected]
+   │  ├─ URL: https://github.com/babel/babel.git
+   │  ├─ VendorName: The Babel Team
+   │  └─ VendorUrl: https://babel.dev/docs/en/next/babel-types
+   ├─ @codemirror/[email protected]
+   │  ├─ URL: https://github.com/codemirror/autocomplete.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ @codemirror/[email protected]
+   │  ├─ URL: https://github.com/codemirror/commands.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ @codemirror/[email protected]
+   │  ├─ URL: https://github.com/codemirror/language.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ @codemirror/[email protected]
+   │  ├─ URL: https://github.com/codemirror/legacy-modes.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ @codemirror/[email protected]
+   │  ├─ URL: https://github.com/codemirror/lint.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ @codemirror/[email protected]
+   │  ├─ URL: https://github.com/codemirror/search.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ @codemirror/[email protected]
+   │  ├─ URL: https://github.com/codemirror/state.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ @codemirror/[email protected]
+   │  ├─ URL: https://github.com/codemirror/view.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ @fortawesome/[email protected]
+   │  ├─ URL: https://github.com/FortAwesome/Font-Awesome
+   │  ├─ VendorName: Dave Gandy
+   │  └─ VendorUrl: https://fontawesome.com/
+   ├─ @fortawesome/[email protected]
+   │  ├─ URL: https://github.com/FortAwesome/Font-Awesome
+   │  ├─ VendorName: The Font Awesome Team
+   │  └─ VendorUrl: https://fontawesome.com/
+   ├─ @fortawesome/[email protected]
+   │  ├─ URL: https://github.com/FortAwesome/Font-Awesome
+   │  ├─ VendorName: The Font Awesome Team
+   │  └─ VendorUrl: https://fontawesome.com/
+   ├─ @fortawesome/[email protected]
+   │  ├─ URL: https://github.com/FortAwesome/vue-fontawesome.git
+   │  └─ VendorUrl: https://github.com/FortAwesome/vue-fontawesome
+   ├─ @jridgewell/[email protected]
+   │  ├─ URL: git+https://github.com/jridgewell/sourcemaps.git
+   │  ├─ VendorName: Justin Ridgewell
+   │  └─ VendorUrl: 
https://github.com/jridgewell/sourcemaps/tree/main/packages/sourcemap-codec
+   ├─ @json2csv/[email protected]
+   │  ├─ URL: git+https://github.com/juanjoDiaz/json2csv.git
+   │  ├─ VendorName: Juanjo Díaz
+   │  └─ VendorUrl: http://juanjodiaz.github.io/json2csv
+   ├─ @json2csv/[email protected]
+   │  ├─ URL: git+https://github.com/juanjoDiaz/json2csv.git
+   │  ├─ VendorName: Juanjo Díaz
+   │  └─ VendorUrl: http://juanjodiaz.github.io/json2csv
+   ├─ @lezer/[email protected]
+   │  ├─ URL: https://github.com/lezer-parser/common.git
+   │  └─ VendorName: Marijn Haverbeke
+   ├─ @lezer/[email protected]
+   │  ├─ URL: https://github.com/lezer-parser/highlight.git
+   │  └─ VendorName: Marijn Haverbeke
+   ├─ @lezer/[email protected]
+   │  ├─ URL: https://github.com/lezer-parser/lr.git
+   │  └─ VendorName: Marijn Haverbeke
+   ├─ @popperjs/[email protected]
+   │  ├─ URL: https://github.com/popperjs/popper-core.git
+   │  └─ VendorName: Federico Zivolo
+   ├─ @streamparser/[email protected]
+   │  ├─ URL: https://github.com/juanjoDiaz/streamparser-json.git
+   │  ├─ VendorName: Juanjo Diaz
+   │  └─ VendorUrl: https://github.com/juanjoDiaz/jsonparse2#readme
+   ├─ @types/[email protected]
+   │  ├─ URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+   │  └─ VendorUrl: 
https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/trusted-types
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/vue-compat#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/compiler-core#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/compiler-dom#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/compiler-ssr#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: https://github.com/vuejs/vue-devtools.git
+   │  └─ VendorName: Guillaume Chau
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/reactivity#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/runtime-core#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/runtime-dom#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/server-renderer#readme
+   ├─ @vue/[email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: 
https://github.com/vuejs/core/tree/main/packages/shared#readme
+   ├─ @zazuko/[email protected]
+   │  ├─ URL: https://github.com/zazuko/Yasgui.git
+   │  ├─ VendorName: Triply
+   │  └─ VendorUrl: https://github.com/zazuko/Yasgui
+   ├─ @zazuko/[email protected]
+   │  ├─ URL: https://github.com/zazuko/Yasgui.git
+   │  ├─ VendorName: Triply
+   │  └─ VendorUrl: https://github.com/zazuko/Yasgui
+   ├─ @zazuko/[email protected]
+   │  ├─ URL: https://github.com/zazuko/Yasgui.git
+   │  ├─ VendorName: Triply
+   │  └─ VendorUrl: https://github.com/zazuko/Yasgui
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/mysticatea/abort-controller.git
+   │  ├─ VendorName: Toru Nagashima
+   │  └─ VendorUrl: https://github.com/mysticatea/abort-controller#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/alexindigo/asynckit.git
+   │  ├─ VendorName: Alex Indigo
+   │  └─ VendorUrl: https://github.com/alexindigo/asynckit#readme
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/axios/axios.git
+   │  ├─ VendorName: Matt Zabriskie
+   │  └─ VendorUrl: https://axios-http.com/
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/beatgammit/base64-js.git
+   │  ├─ VendorName: T. Jameson Little
+   │  └─ VendorUrl: https://github.com/beatgammit/base64-js
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/twbs/bootstrap.git
+   │  ├─ VendorName: The Bootstrap Authors
+   │  └─ VendorUrl: https://getbootstrap.com/
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/feross/buffer.git
+   │  ├─ VendorName: Feross Aboukhadijeh
+   │  └─ VendorUrl: https://github.com/feross/buffer
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/call-bind-apply-helpers.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/call-bind-apply-helpers#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/call-bound.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/call-bound#readme
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/codemirror/CodeMirror.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: https://codemirror.net/5/
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/codemirror/basic-setup.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: http://marijnhaverbeke.nl
+   ├─ [email protected]
+   │  ├─ URL: http://github.com/Marak/colors.js.git
+   │  ├─ VendorName: Marak Squires
+   │  └─ VendorUrl: https://github.com/Marak/colors.js
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/felixge/node-combined-stream.git
+   │  ├─ VendorName: Felix Geisendörfer
+   │  └─ VendorUrl: https://github.com/felixge/node-combined-stream
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/marijnh/crelt.git
+   │  ├─ VendorName: Marijn Haverbeke
+   │  └─ VendorUrl: https://github.com/marijnh/crelt#readme
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/frenic/csstype
+   │  └─ VendorName: Fredrik Nicol
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/DataTables/Dist-DataTables-DataTables.git
+   │  ├─ VendorName: SpryMedia Ltd
+   │  └─ VendorUrl: https://datatables.net/
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/DataTables/Dist-DataTables.git
+   │  ├─ VendorName: SpryMedia Ltd
+   │  └─ VendorUrl: https://datatables.net/
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/SamVerschueren/decode-uri-component.git
+   │  ├─ VendorName: Sam Verschueren
+   │  └─ VendorUrl: github.com/SamVerschueren
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/felixge/node-delayed-stream.git
+   │  ├─ VendorName: Felix Geisendörfer
+   │  └─ VendorUrl: https://github.com/felixge/node-delayed-stream
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/es-shims/dunder-proto.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/es-shims/dunder-proto#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/es-define-property.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/es-define-property#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/es-errors.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/es-errors#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/es-object-atoms.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/es-object-atoms#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/es-shims/es-set-tostringtag.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/es-shims/es-set-tostringtag#readme
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/Rich-Harris/estree-walker
+   │  └─ VendorName: Rich Harris
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/mysticatea/event-target-shim.git
+   │  ├─ VendorName: Toru Nagashima
+   │  └─ VendorUrl: https://github.com/mysticatea/event-target-shim
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/Gozala/events.git
+   │  ├─ VendorName: Irakli Gozalishvili
+   │  └─ VendorUrl: http://jeditoolkit.com
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/sindresorhus/filter-obj.git
+   │  ├─ VendorName: Sindre Sorhus
+   │  └─ VendorUrl: sindresorhus.com
+   ├─ [email protected]
+   │  ├─ URL: git+ssh://[email protected]/follow-redirects/follow-redirects.git
+   │  ├─ VendorName: Ruben Verborgh
+   │  └─ VendorUrl: https://github.com/follow-redirects/follow-redirects
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/form-data/form-data.git
+   │  ├─ VendorName: Felix Geisendörfer
+   │  └─ VendorUrl: http://debuggable.com/
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/Raynos/function-bind.git
+   │  ├─ VendorName: Raynos
+   │  └─ VendorUrl: https://github.com/Raynos/function-bind
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/get-intrinsic.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/get-intrinsic#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/get-proto.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/get-proto#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/gopd.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/gopd#readme
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/inspect-js/has-symbols.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/has-symbols#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/inspect-js/has-tostringtag.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/inspect-js/has-tostringtag#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/inspect-js/hasOwn.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/inspect-js/hasOwn#readme
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/jquery/jquery.git
+   │  ├─ VendorName: OpenJS Foundation and other contributors
+   │  └─ VendorUrl: https://jquery.com/
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/lodash/lodash.git
+   │  ├─ VendorName: John-David Dalton
+   │  └─ VendorUrl: https://lodash.com/custom-builds
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/Rich-Harris/magic-string.git
+   │  └─ VendorName: Rich Harris
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/es-shims/math-intrinsics.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/es-shims/math-intrinsics#readme
+   ├─ [email protected]
+   │  └─ URL: https://github.com/jshttp/mime-db.git
+   ├─ [email protected]
+   │  └─ URL: https://github.com/jshttp/mime-types.git
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/developit/mitt.git
+   │  └─ VendorUrl: https://github.com/developit/mitt
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/rdfjs/N3.js.git
+   │  └─ VendorName: Ruben Verborgh
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/ai/nanoid.git
+   │  └─ VendorName: Andrey Sitnik
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/inspect-js/object-inspect.git
+   │  ├─ VendorName: James Halliday
+   │  └─ VendorUrl: https://github.com/inspect-js/object-inspect
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/jshttp/on-headers.git
+   │  └─ VendorName: Douglas Christopher Wilson
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/mholt/PapaParse.git
+   │  ├─ VendorName: Matthew Holt
+   │  └─ VendorUrl: https://www.papaparse.com/
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/postcss/postcss.git
+   │  ├─ VendorName: Andrey Sitnik
+   │  └─ VendorUrl: https://postcss.org/
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/shtylman/node-process.git
+   │  └─ VendorName: Roman Shtylman
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/Rob--W/proxy-from-env.git
+   │  ├─ VendorName: Rob Wu
+   │  └─ VendorUrl: https://github.com/Rob--W/proxy-from-env#readme
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/sindresorhus/query-string.git
+   │  ├─ VendorName: Sindre Sorhus
+   │  └─ VendorUrl: https://sindresorhus.com
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/nodejs/readable-stream
+   │  └─ VendorUrl: https://github.com/nodejs/readable-stream
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/feross/safe-buffer.git
+   │  ├─ VendorName: Feross Aboukhadijeh
+   │  └─ VendorUrl: https://github.com/feross/safe-buffer
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/side-channel-list.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/side-channel-list#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/side-channel-map.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/side-channel-map#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/side-channel-weakmap.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/side-channel-weakmap#readme
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/ljharb/side-channel.git
+   │  ├─ VendorName: Jordan Harband
+   │  └─ VendorUrl: https://github.com/ljharb/side-channel#readme
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/sindresorhus/split-on-first.git
+   │  ├─ VendorName: Sindre Sorhus
+   │  └─ VendorUrl: sindresorhus.com
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/marcuswestin/store.js.git
+   │  ├─ VendorName: Marcus Westin
+   │  └─ VendorUrl: https://github.com/marcuswestin/store.js#readme
+   ├─ [email protected]
+   │  ├─ URL: https://github.com/kevva/strict-uri-encode.git
+   │  ├─ VendorName: Kevin Mårtensson
+   │  └─ VendorUrl: github.com/kevva
+   ├─ [email protected]
+   │  ├─ URL: git://github.com/nodejs/string_decoder.git
+   │  └─ VendorUrl: https://github.com/nodejs/string_decoder
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/marijnh/style-mod.git
+   │  └─ VendorName: Marijn Haverbeke
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/vuejs/router.git
+   │  ├─ VendorName: Eduardo San Martin Morote
+   │  └─ VendorUrl: https://router.vuejs.org/
+   ├─ [email protected]
+   │  ├─ URL: git+https://github.com/vuejs/core.git
+   │  ├─ VendorName: Evan You
+   │  └─ VendorUrl: https://github.com/vuejs/core/tree/main/packages/vue#readme
+   └─ [email protected]
+      ├─ URL: git+https://github.com/marijnh/w3c-keyname.git
+      ├─ VendorName: Marijn Haverbeke
+      └─ VendorUrl: https://github.com/marijnh/w3c-keyname#readme
+Done in 0.08s.
diff --git a/jena-fuseki2/apache-jena-fuseki/dist/README 
b/jena-fuseki2/apache-jena-fuseki/dist/README
index 509cab04e0..fe1293ed01 100644
--- a/jena-fuseki2/apache-jena-fuseki/dist/README
+++ b/jena-fuseki2/apache-jena-fuseki/dist/README
@@ -6,21 +6,18 @@ Apache Jena Fuseki is a SPARQL server.
 Full documentation:
   http://jena.apache.org/documentation/fuseki2/
 
-This distribution contains Fuseki2 package as a self-contained jar, to run as 
an
-operating system process.
+This distribution contains Fuseki2 package as a self-contained jar.
+It can be run as an operating system process.
 
-The script 'fuseki-server' is a script to run the server using
-'fuseki-server.jar from the command line.  Use 'fuseki-server --help' for
-details.
+The script 'fuseki-server' is a script to run the server, with UI,
+using 'fuseki-server.jar' from the command line.
 
-The script 'fuseki' is a Linux init script to run Fuseki as an OS service.
+The script 'fuskei-plain' runs the same 'fuseki-server.jar' without a UI.
+
+The script 'service/fuseki.initd' is a Linux init script to run Fuseki as an 
OS service.
 The file 'fuseki.service' is a systemd unit file to run Fuseki2 as a service.
 Instructions are in comments at the start of the files.
 
-A WAR file to run Fuseki in a webapp container server, such as Apache
-Tomcat, can be obtained from https://downloads.apache.org/jena/binaries/
-or https://repo1.maven.org/maven2/org/apache/jena/jena-fuseki-war/.
-
 A Dockerfile which can be customized for choices of storage can be found at:
 
 https://repo1.maven.org/maven2/org/apache/jena/jena-fuseki-docker/
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki-plain 
b/jena-fuseki2/apache-jena-fuseki/fuseki-plain
index c90d69fb1e..8b8a627442 100755
--- a/jena-fuseki2/apache-jena-fuseki/fuseki-plain
+++ b/jena-fuseki2/apache-jena-fuseki/fuseki-plain
@@ -17,5 +17,5 @@
 
 ## Run Fuseki as a standalone server with no UI
 
-export MAIN=org.apache.jena.fuseki.main.cmds.FusekiMainCmd
-exec fuseki-server "$#"
+export MAIN="server-plain"
+exec fuseki-server "$@"
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki-server 
b/jena-fuseki2/apache-jena-fuseki/fuseki-server
index 25943f7511..b0f04afcbb 100755
--- a/jena-fuseki2/apache-jena-fuseki/fuseki-server
+++ b/jena-fuseki2/apache-jena-fuseki/fuseki-server
@@ -114,24 +114,27 @@ then
     LOGGING="-Dlog4j.configurationFile=$DFT_LOG_CONF"
 fi
 
-## MAIN="${MAIN:-org.apache.jena.fuseki.main.cmds.FusekiMainCmd}"
+## Fuseki server. Default: with UI and admin area.
+MAIN="${MAIN:-serverUI}"
 
-## Fuseki server, with UI and admin area.
-MAIN="${MAIN:-server}"
-
-## Translater names into Java entry points.
+## Translate names into Java entry points.
 case $MAIN in
     ## Minimal server - no additional features.
-    "basic")  MAIN=org.apache.jena.fuseki.main.cmds.FusekiBasicCmd ;;
-    
-    ## Server, no UI, no admin work area, only Prometheus.
-    "main")   MAIN=org.apache.jena.fuseki.main.cmds.FusekiMainCmd ;;
-
-    ## Plain server, with Fuseki modules, no UI, no admin work area, only 
Prometheus.
-    "plain")  MAIN=org.apache.jena.fuseki.main.cmds.FusekiServerPlainCmd ;;
-
-    ## Full server, with Fuseki modules, no UI, no admin work area, only 
Prometheus.
-    "server") MAIN=org.apache.jena.fuseki.main.cmds.FusekiServerCmd ;;
+    "basic")
+       MAIN='org.apache.jena.fuseki.main.cmds.FusekiBasicCmd'
+       ;;
+    ## Server, no UI, no admin work area, only Prometheus and Shiro
+    "main")
+       MAIN='org.apache.jena.fuseki.main.cmds.FusekiMainCmd'
+       ;;
+    ## Plain server, with Fuseki modules, no UI, no admin work area, with 
Prometheus and Shiro.
+    "server-plain" | "plain")
+       MAIN='org.apache.jena.fuseki.main.cmds.FusekiServerPlainCmd'
+       ;;
+    ## Full server, with Fuseki modules, with UI and with an admin work area.
+    "serverui"| "server-ui" | "serverUI" )
+       MAIN='org.apache.jena.fuseki.main.cmds.FusekiServerUICmd'
+       ;;
 esac
 
 if [ -n "$LOGGING" ]
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki-server.bat 
b/jena-fuseki2/apache-jena-fuseki/fuseki-server.bat
index 5ab6e0f058..f20a51b10d 100644
Binary files a/jena-fuseki2/apache-jena-fuseki/fuseki-server.bat and 
b/jena-fuseki2/apache-jena-fuseki/fuseki-server.bat differ
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki 
b/jena-fuseki2/apache-jena-fuseki/service/fuseki.initd
old mode 100755
new mode 100644
similarity index 92%
rename from jena-fuseki2/apache-jena-fuseki/fuseki
rename to jena-fuseki2/apache-jena-fuseki/service/fuseki.initd
index b355972e40..ed8554dd6a
--- a/jena-fuseki2/apache-jena-fuseki/fuseki
+++ b/jena-fuseki2/apache-jena-fuseki/service/fuseki.initd
@@ -85,7 +85,7 @@
 # Default-Start:     3 4 5
 # Default-Stop:      0 1 2 6
 # Short-Description: Start Jena Fuseki at boot time
-# Description:       Jena Fuseki is a service that provides a SPARQL API over 
HTTP
+# Description:       Apache Jena Fuseki is a service that provides the SPARQL 
API over HTTP
 ### END INIT INFO
 
 # DEBUG=1
@@ -254,7 +254,7 @@ if [ -z "$JAVA" ]
 then
     if [ -z "$JAVA_HOME" ]
     then
-       JAVA=$(which java)
+       JAVA=$(which java)
     else
         JAVA=$JAVA_HOME/bin/java
     fi
@@ -295,10 +295,30 @@ then
   fi
 fi
 
-# Run command
-## Plain server, no UI, no admin work area.
-## MAIN=org.apache.jena.fuseki.main.cmds.FusekiMainCmd
-MAIN=org.apache.jena.fuseki.main.cmds.FusekiServerCmd
+# -- Run command
+## Default: Fuseki server, with UI and admin area.
+MAIN="${MAIN:-serverUI}"
+
+## Translate names into Java entry points.
+case $MAIN in
+    ## Minimal server - no additional features.
+    "basic")
+       MAIN='org.apache.jena.fuseki.main.cmds.FusekiBasicCmd'
+       ;;
+    ## Server, no UI, no admin work area, only Prometheus and Shiro
+    "main")
+       MAIN='org.apache.jena.fuseki.main.cmds.FusekiMainCmd'
+       ;;
+    ## Plain server, with Fuseki modules, no UI, no admin work area, with 
Prometheus and Shiro.
+    "server-plain" | "plain")
+       MAIN='org.apache.jena.fuseki.main.cmds.FusekiServerPlainCmd'
+       ;;
+    ## Full server, with Fuseki modules, with UI and with an admin work area.
+    "serverui"| "server-ui" | "serverUI" )
+       MAIN='org.apache.jena.fuseki.main.cmds.FusekiServerUICmd'
+       ;;
+esac
+# -- Run command
 
 if [ -z "$FUSEKI_CLASSES" ]
 then
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki.service 
b/jena-fuseki2/apache-jena-fuseki/service/fuseki.service
similarity index 100%
rename from jena-fuseki2/apache-jena-fuseki/fuseki.service
rename to jena-fuseki2/apache-jena-fuseki/service/fuseki.service
diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml 
b/jena-fuseki2/jena-fuseki-server/pom.xml
index 647d684e9d..46de733b50 100644
--- a/jena-fuseki2/jena-fuseki-server/pom.xml
+++ b/jena-fuseki2/jena-fuseki-server/pom.xml
@@ -111,7 +111,7 @@
 
           <transformers>
             <transformer 
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-              <mainClass>org.apache.jena.fuseki.main.cmds.FusekiCmd</mainClass>
+              
<mainClass>org.apache.jena.fuseki.main.cmds.FusekiServerCmd</mainClass>
               <!-- https://issues.apache.org/jira/browse/LOG4J2-2537 -->
               <manifestEntries>
                 <Multi-Release>true</Multi-Release>


Reply via email to