[java-idp-plugin-jetty] 03/05: JJETTY-24 Changes for Jetty-Base 12.1
Rod Widdowson
rdw at steadingsoftware.com
Wed Oct 22 15:05:11 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-idp-plugin-jetty.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=eb46b6733e9c61a96751144198bd64c38a38441f
commit eb46b6733e9c61a96751144198bd64c38a38441f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Oct 21 19:49:02 2025 +0100
JJETTY-24 Changes for Jetty-Base 12.1
https://shibboleth.atlassian.net/browse/JJETTY-24
Cut down the base module to deploy everything *except* idp.ini.
Custom.ini is gone. Much of idp.ini is now in shibboleth.ini and the window distinction is now gone.
---
.../shibboleth/idp/module/jetty/module.properties | 118 ++++++++-------------
1 file changed, 44 insertions(+), 74 deletions(-)
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
index dcc3eea..6de28bd 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
@@ -15,116 +15,86 @@ jetty.module.1.dest = jetty-base-12/etc/jetty-requestlog.xml
jetty.module.2.src = /net/shibboleth/idp/module/jetty/jetty-base-12/modules/idp.mod
jetty.module.2.dest = jetty-base-12/modules/idp.mod
-jetty.module.3.src = /net/shibboleth/idp/module/jetty/jetty-base-12/resources/logback.xml
-jetty.module.3.dest = jetty-base-12/resources/logback.xml
+jetty.module.3.src = /net/shibboleth/idp/module/jetty/jetty-base-12/modules/sp.mod
+jetty.module.3.dest = jetty-base-12/modules/sp.mod
-jetty.module.4.src = /net/shibboleth/idp/module/jetty/jetty-base-12/webapps/idp.xml
-jetty.module.4.dest = jetty-base-12/webapps/idp.xml
+jetty.module.4.src = /net/shibboleth/idp/module/jetty/jetty-base-12/resources/logback.xml
+jetty.module.4.dest = jetty-base-12/resources/logback.xml
-jetty.module.5.src = /net/shibboleth/idp/module/jetty/jetty-base-12/webapps/static.xml
-jetty.module.5.dest = jetty-base-12/webapps/static.xml
+jetty.module.5.src = /net/shibboleth/idp/module/jetty/jetty-base-12/webapps/idp.xml
+jetty.module.5.dest = jetty-base-12/webapps/idp.xml
-jetty.module.6.src = /net/shibboleth/idp/module/jetty/jetty-base-12/static/index.html
-jetty.module.6.dest = jetty-base-12/static/index.html
+jetty.module.6.src = /net/shibboleth/idp/module/jetty/jetty-base-12/webapps/static.xml
+jetty.module.6.dest = jetty-base-12/webapps/static.xml
-jetty.module.7.src = /net/shibboleth/idp/module/jetty/jetty-cli.jar
-jetty.module.7.dest = bin/net.shibboleth.idp.jetty-base/jetty-cli.jar
-jetty.module.7.replace = true
+jetty.module.7.src = /net/shibboleth/idp/module/jetty/jetty-base-12/static/index.html
+jetty.module.7.dest = jetty-base-12/static/index.html
-# For legacy reasons we separate Windows and non windows start.d
+jetty.module.8.src = /net/shibboleth/idp/module/jetty/jetty-cli.jar
+jetty.module.8.dest = bin/net.shibboleth.idp.jetty-base/jetty-cli.jar
+jetty.module.8.replace = true
-jetty.module.8.src = /net/shibboleth/idp/module/jetty/jetty-base-12/start.d/custom.ini
-jetty.module.8.dest = jetty-base-12/start.d/custom.ini
-jetty.module.8.nonwindows = true
-jetty.module.8.windows = false
-jetty.module.8.replace = false
-
-jetty.module.9.src = /net/shibboleth/idp/module/jetty/jetty-base-12/start.d/idp.ini
-jetty.module.9.dest = jetty-base-12/start.d/idp.ini
-jetty.module.9.nonwindows = true
-jetty.module.9.windows = false
-jetty.module.9.replace = false
+jetty.module.9.src = /net/shibboleth/idp/module/jetty/jetty-base-12/start.d/shibboleth.ini
+jetty.module.9.dest = jetty-base-12/start.d/shibboleth.ini
#
-# On windows let people see what unix is getting but dont make it active
+# Command lines (bat and sh)
#
-jetty.module.10.src = /net/shibboleth/idp/module/jetty/jetty-base-12/start.d/idp.ini
-jetty.module.10.dest = jetty-base-12/start.d/idp.ini-unix
+jetty.module.10.src = /net/shibboleth/idp/module/jetty/runjetty.bat
+jetty.module.10.dest = bin/runjetty.bat
jetty.module.10.nonwindows = false
jetty.module.10.windows = true
jetty.module.10.replace = true
+jetty.module.11.src = /net/shibboleth/idp/module/jetty/runjetty.sh
+jetty.module.11.dest = bin/runjetty.sh
+jetty.module.11.nonwindows = true
+jetty.module.11.windows = false
+jetty.module.11.exec = true
-jetty.module.11.src = /net/shibboleth/idp/module/jetty/jetty-base-12-windows/start.d/idp-system.ini
-jetty.module.11.dest = jetty-base-12/start.d/idp-system.ini
-jetty.module.11.nonwindows = false
-jetty.module.11.windows = true
-jetty.module.11.replace = true
-
-jetty.module.12.src = /net/shibboleth/idp/module/jetty/jetty-base-12-windows/start.d/idp.ini-windows
-jetty.module.12.dest = jetty-base-12/start.d/idp.ini
+jetty.module.12.src = /net/shibboleth/idp/module/jetty/config-jetty.bat
+jetty.module.12.dest = bin/config-jetty.bat
jetty.module.12.nonwindows = false
jetty.module.12.windows = true
-jetty.module.12.replace = false
+jetty.module.12.replace = true
-#
-# Command lines (bat and sh)
-#
-jetty.module.13.src = /net/shibboleth/idp/module/jetty/runjetty.bat
-jetty.module.13.dest = bin/runjetty.bat
+jetty.module.13.src = /net/shibboleth/idp/module/jetty/downloadjetty.bat
+jetty.module.13.dest = bin/downloadjetty.bat
jetty.module.13.nonwindows = false
jetty.module.13.windows = true
jetty.module.13.replace = true
-jetty.module.14.src = /net/shibboleth/idp/module/jetty/runjetty.sh
-jetty.module.14.dest = bin/runjetty.sh
+jetty.module.14.src = /net/shibboleth/idp/module/jetty/downloadjetty.sh
+jetty.module.14.dest = bin/downloadjetty.sh
jetty.module.14.nonwindows = true
jetty.module.14.windows = false
jetty.module.14.exec = true
+jetty.module.14.replace = true
-jetty.module.15.src = /net/shibboleth/idp/module/jetty/config-jetty.bat
-jetty.module.15.dest = bin/config-jetty.bat
+jetty.module.15.src = /net/shibboleth/idp/module/jetty/downloadprocrun.bat
+jetty.module.15.dest = bin/downloadprocrun.bat
jetty.module.15.nonwindows = false
jetty.module.15.windows = true
jetty.module.15.replace = true
-jetty.module.16.src = /net/shibboleth/idp/module/jetty/downloadjetty.bat
-jetty.module.16.dest = bin/downloadjetty.bat
+jetty.module.16.src = /net/shibboleth/idp/module/jetty/setprocrunversion.bat
+jetty.module.16.dest = bin/setprocrunversion.bat
jetty.module.16.nonwindows = false
jetty.module.16.windows = true
jetty.module.16.replace = true
-jetty.module.17.src = /net/shibboleth/idp/module/jetty/downloadjetty.sh
-jetty.module.17.dest = bin/downloadjetty.sh
-jetty.module.17.nonwindows = true
-jetty.module.17.windows = false
-jetty.module.17.exec = true
+jetty.module.17.src = /net/shibboleth/idp/module/jetty/setjettyversion.bat
+jetty.module.17.dest = bin/setjettyversion.bat
+jetty.module.17.nonwindows = false
+jetty.module.17.windows = true
jetty.module.17.replace = true
-jetty.module.18.src = /net/shibboleth/idp/module/jetty/downloadprocrun.bat
-jetty.module.18.dest = bin/downloadprocrun.bat
+jetty.module.18.src = /net/shibboleth/idp/module/jetty/setjettybase.bat
+jetty.module.18.dest = bin/setjettybase.bat
jetty.module.18.nonwindows = false
jetty.module.18.windows = true
jetty.module.18.replace = true
-jetty.module.19.src = /net/shibboleth/idp/module/jetty/setprocrunversion.bat
-jetty.module.19.dest = bin/setprocrunversion.bat
-jetty.module.19.nonwindows = false
-jetty.module.19.windows = true
-jetty.module.19.replace = true
-
-jetty.module.20.src = /net/shibboleth/idp/module/jetty/setjettyversion.bat
-jetty.module.20.dest = bin/setjettyversion.bat
-jetty.module.20.nonwindows = false
-jetty.module.20.windows = true
-jetty.module.20.replace = true
-
-jetty.module.21.src = /net/shibboleth/idp/module/jetty/setjettybase.bat
-jetty.module.21.dest = bin/setjettybase.bat
-jetty.module.21.nonwindows = false
-jetty.module.21.windows = true
-jetty.module.21.replace = true
-
-jetty.module.22.src = /net/shibboleth/idp/module/jetty/jetty-base-download-keystore.gpg
-jetty.module.22.dest = credentials/jetty-base-download-keystore.gpg
-jetty.module.22.replace = false
\ No newline at end of file
+jetty.module.19.src = /net/shibboleth/idp/module/jetty/jetty-base-download-keystore.gpg
+jetty.module.19.dest = credentials/jetty-base-download-keystore.gpg
+jetty.module.19.replace = false
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list