[java-idp-jetty-base] 01/04: IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation
Rod Widdowson
rdw at steadingsoftware.com
Wed Oct 16 13:25:06 UTC 2024
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/IDP-2297
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=a14281d8e93ce4efa4ac46016ab2bba2244e6372
commit a14281d8e93ce4efa4ac46016ab2bba2244e6372
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 16 14:07:04 2024 +0100
IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation
https://shibboleth.atlassian.net/issues/IDP-2297
Move around a bunch of files preparatory to being able to build an old style jetty-base distro
---
.../idp/plugin/jettybase/module.properties | 51 ++++++++++++----------
.../start.d/idp-system.ini | 0
.../start.d/idp.ini-windows | 0
.../{ => jetty-base}/etc/jetty-requestlog.xml | 0
.../module/{ => jetty-base}/modules/idp.mod | 0
.../module/{ => jetty-base}/resources/logback.xml | 0
.../module/{ => jetty-base}/start.d/custom.ini | 0
.../module/{ => jetty-base}/start.d/idp.ini | 0
.../module/{ => jetty-base}/static/index.html | 0
.../module/{ => jetty-base}/webapps/idp.xml | 0
.../module/{ => jetty-base}/webapps/static.xml | 0
11 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
index aa7b4b2..a507bae 100644
--- a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
+++ b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
@@ -9,61 +9,68 @@ jetty.base.plugin = net.shibboleth.idp.plugin.jettybase
jetty.base.module.name = Jetty Base Module
jetty.base.module.desc = Configures jetty
-jetty.base.module.1.src = /net/shibboleth/idp/plugin/jettybase/module/etc/jetty-requestlog.xml
+jetty.base.module.1.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
jetty.base.module.1.dest = jetty-base/etc/jetty-requestlog.xml
-jetty.base.module.2.src = /net/shibboleth/idp/plugin/jettybase/module/modules/idp.mod
+jetty.base.module.2.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
jetty.base.module.2.dest = jetty-base/modules/idp.mod
-jetty.base.module.3.src = /net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml
+jetty.base.module.3.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
jetty.base.module.3.dest = jetty-base/resources/logback.xml
-jetty.base.module.4.src = /net/shibboleth/idp/plugin/jettybase/module/webapps/idp.xml
+jetty.base.module.4.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
jetty.base.module.4.dest = jetty-base/webapps/idp.xml
-jetty.base.module.5.src = /net/shibboleth/idp/plugin/jettybase/module/webapps/static.xml
+jetty.base.module.5.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
jetty.base.module.5.dest = jetty-base/webapps/static.xml
-jetty.base.module.6.src = /net/shibboleth/idp/plugin/jettybase/module/static/index.html
+jetty.base.module.6.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
jetty.base.module.6.dest = jetty-base/static/index.html
# For legacy reasons we separate Windows and non windows start.d
-jetty.base.module.7.src = /net/shibboleth/idp/plugin/jettybase/module/start.d/custom.ini
+jetty.base.module.7.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
jetty.base.module.7.dest = jetty-base/start.d/custom.ini
jetty.base.module.7.nonwindows = true
jetty.base.module.7.windows = false
jetty.base.module.7.replace = false
-jetty.base.module.8.src = /net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini
+jetty.base.module.8.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
jetty.base.module.8.dest = jetty-base/start.d/idp.ini
jetty.base.module.8.nonwindows = true
jetty.base.module.8.windows = false
jetty.base.module.8.replace = false
-jetty.base.module.9.src = /net/shibboleth/idp/plugin/jettybase/module/start.d/idp-system.ini
-jetty.base.module.9.dest = jetty-base/start.d/idp-system.ini
+jetty.base.module.9.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
+jetty.base.module.9.dest = jetty-base/start.d/idp.ini-unix
jetty.base.module.9.nonwindows = false
jetty.base.module.9.windows = true
-jetty.base.module.9.replace = true
+jetty.base.module.9.replace = false
-jetty.base.module.10.src = /net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini-windows
-jetty.base.module.10.dest = jetty-base/start.d/idp.ini
+
+jetty.base.module.10.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
+jetty.base.module.10.dest = jetty-base/start.d/idp-system.ini
jetty.base.module.10.nonwindows = false
jetty.base.module.10.windows = true
-jetty.base.module.10.replace = false
+jetty.base.module.10.replace = true
-jetty.base.module.11.src = /net/shibboleth/idp/plugin/jettybase/module/runjetty.bat
-jetty.base.module.11.dest = bin/runjetty.bat
+jetty.base.module.11.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
+jetty.base.module.11.dest = jetty-base/start.d/idp.ini
jetty.base.module.11.nonwindows = false
jetty.base.module.11.windows = true
-
-jetty.base.module.12.src = /net/shibboleth/idp/plugin/jettybase/module/runjetty.sh
-jetty.base.module.12.dest = bin/runjetty.sh
-jetty.base.module.12.nonwindows = true
-jetty.base.module.12.windows = false
-jetty.base.module.12.exec = true
+jetty.base.module.11.replace = false
+
+jetty.base.module.12.src = /net/shibboleth/idp/plugin/jettybase/module/runjetty.bat
+jetty.base.module.12.dest = bin/runjetty.bat
+jetty.base.module.12.nonwindows = false
+jetty.base.module.12.windows = true
+
+jetty.base.module.13.src = /net/shibboleth/idp/plugin/jettybase/module/runjetty.sh
+jetty.base.module.13.dest = bin/runjetty.sh
+jetty.base.module.13.nonwindows = true
+jetty.base.module.13.windows = false
+jetty.base.module.13.exec = true
jetty.base.module.13.src = /net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat
jetty.base.module.13.dest = bin/config-jetty.bat
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp-system.ini b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp-system.ini
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini-windows b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini-windows
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/etc/jetty-requestlog.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/etc/jetty-requestlog.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/modules/idp.mod b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/modules/idp.mod
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/custom.ini b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/custom.ini
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/static/index.html b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/static/index.html
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/webapps/idp.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/webapps/idp.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/webapps/static.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/webapps/static.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list