[java-idp-jetty-base] 03/03: JJETTY-13 Implement Jetty-base plugin V2 https://shibboleth.atlassian.net/browse/JJETTY-13

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/JJETTY-13
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=487c08b9ddb107253d21ef8fcc2a4f1df641b247

commit 487c08b9ddb107253d21ef8fcc2a4f1df641b247
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 22 13:55:04 2025 +0100

    JJETTY-13 Implement Jetty-base plugin V2
    https://shibboleth.atlassian.net/browse/JJETTY-13
    
    Start to add command files.
    
    UNTESTED
---
 .../shibboleth/idp/module/jetty/downloadjetty.bat  | 11 +++
 .../shibboleth/idp/module/jetty/downloadjetty.sh   | 10 +++
 .../idp/module/jetty/downloadprocrun.bat           | 14 ++++
 .../shibboleth/idp/module/jetty/module.properties  | 85 +++++++++++++---------
 4 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat
new file mode 100644
index 0000000..abedbdc
--- /dev/null
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat
@@ -0,0 +1,11 @@
+ at echo foo
+setlocal
+
+REM Add code to check that the target and the directory doesnt exist
+REM Add code to create and add everyone-RO ACL/administrators W on jetty-downloads (if it doesnt exist)
+
+
+set CLASSPATH=%~dp0\net.shibboleth.idp.jetty-base\jetty-cli.jar
+
+runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI %*
+
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.sh b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.sh
new file mode 100644
index 0000000..9594d37
--- /dev/null
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.sh
@@ -0,0 +1,10 @@
+declare LOCATION
+declare CLASSPATH
+
+#Add code to check that the target and the directory doesnt exist
+
+LOCATION=$(dirname $0)
+CLASSPATH=$LOCATION/net.shibboleth.idp.jetty-base/jetty-cli.jar
+
+$LOCATION/runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI "$@"
+
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat
new file mode 100644
index 0000000..97b899c
--- /dev/null
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat
@@ -0,0 +1,14 @@
+ at echo foo
+setlocal
+
+REM Add code to check that the target and the directory doesnt exist
+REM Add code to create and add everyone-RO ACL/administrators W on jetty-downloads (if it doesnt exist)
+
+
+
+set CLASSPATH=%~dp0\net.shibboleth.idp.jetty-base\jetty-cli.jar
+
+SET MAVEN_ARGS=--type zip --classifier bin-windows --groupId commons-dameon --artifactIs commons-daemon
+
+runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI %MAVEB_ARGS% %*
+
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 59dc72b..c27ce2a 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
@@ -27,54 +27,73 @@ jetty.module.5.dest = jetty-base/webapps/static.xml
 jetty.module.6.src = /net/shibboleth/idp/module/jetty/jetty-base/static/index.html
 jetty.module.6.dest = jetty-base/static/index.html
 
+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
 
 # For legacy reasons we separate Windows and non windows start.d
 
-jetty.module.7.src = /net/shibboleth/idp/module/jetty/jetty-base/start.d/custom.ini
-jetty.module.7.dest = jetty-base/start.d/custom.ini
-jetty.module.7.nonwindows = true
-jetty.module.7.windows = false
-jetty.module.7.replace = false
-
-jetty.module.8.src = /net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
-jetty.module.8.dest = jetty-base/start.d/idp.ini
+jetty.module.8.src = /net/shibboleth/idp/module/jetty/jetty-base/start.d/custom.ini
+jetty.module.8.dest = jetty-base/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/start.d/idp.ini
-jetty.module.9.dest = jetty-base/start.d/idp.ini-unix
-jetty.module.9.nonwindows = false
-jetty.module.9.windows = true
+jetty.module.9.dest = jetty-base/start.d/idp.ini
+jetty.module.9.nonwindows = true
+jetty.module.9.windows = false
 jetty.module.9.replace = false
 
-
-jetty.module.10.src = /net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp-system.ini
-jetty.module.10.dest = jetty-base/start.d/idp-system.ini
+jetty.module.10.src = /net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
+jetty.module.10.dest = jetty-base/start.d/idp.ini-unix
 jetty.module.10.nonwindows = false
 jetty.module.10.windows = true
-jetty.module.10.replace = true
+jetty.module.10.replace = false
 
-jetty.module.11.src = /net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp.ini-windows
-jetty.module.11.dest = jetty-base/start.d/idp.ini
+
+jetty.module.11.src = /net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp-system.ini
+jetty.module.11.dest = jetty-base/start.d/idp-system.ini
 jetty.module.11.nonwindows = false
 jetty.module.11.windows = true
-jetty.module.11.replace = false
+jetty.module.11.replace = true
 
-jetty.module.12.src = /net/shibboleth/idp/module/jetty/runjetty.bat
-jetty.module.12.dest = bin/runjetty.bat
+jetty.module.12.src = /net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp.ini-windows
+jetty.module.12.dest = jetty-base/start.d/idp.ini
 jetty.module.12.nonwindows = false
 jetty.module.12.windows = true
-
-jetty.module.13.src = /net/shibboleth/idp/module/jetty/runjetty.sh
-jetty.module.13.dest = bin/runjetty.sh
-jetty.module.13.nonwindows = true
-jetty.module.13.windows = false
-jetty.module.13.exec = true
-
-jetty.module.14.src = /net/shibboleth/idp/module/jetty/config-jetty.bat
-jetty.module.14.dest = bin/config-jetty.bat
-jetty.module.14.nonwindows = false
-jetty.module.14.windows = true
-
-
+jetty.module.12.replace = false
+
+#
+# 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.nonwindows = false
+jetty.module.13.windows = true
+
+jetty.module.14.src = /net/shibboleth/idp/module/jetty/runjetty.sh
+jetty.module.14.dest = bin/runjetty.sh
+jetty.module.14.nonwindows = true
+jetty.module.14.windows = false
+jetty.module.14.exec = true
+
+jetty.module.15.src = /net/shibboleth/idp/module/jetty/config-jetty.bat
+jetty.module.15.dest = bin/config-jetty.bat
+jetty.module.15.nonwindows = false
+jetty.module.15.windows = true
+
+jetty.module.16.src = /net/shibboleth/idp/module/jetty/downloadjetty.bat
+jetty.module.16.dest = bin/downloadjetty.bat
+jetty.module.16.nonwindows = false
+jetty.module.16.windows = 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.18.src = /net/shibboleth/idp/module/jetty/downloadprocrun.bat
+jetty.module.18.dest = bin/downloadprocrun.bat
+jetty.module.18.nonwindows = false
+jetty.module.18.windows = true

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.