[java-idp-plugin-jetty] 01/03: Push WIP into a dev branch
Rod Widdowson
rdw at steadingsoftware.com
Wed Aug 6 18:28:08 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/BatfileWIP
in repository java-idp-plugin-jetty.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=e931e452e3eb48d1f1c658d2938d6439e77edc86
commit e931e452e3eb48d1f1c658d2938d6439e77edc86
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 31 19:17:58 2025 +0100
Push WIP into a dev branch
---
.../shibboleth/idp/module/jetty/config-jetty.bat | 48 +++++++++++++++-------
.../shibboleth/idp/module/jetty/downloadjetty.bat | 14 +++++--
.../shibboleth/idp/module/jetty/downloadjetty.sh | 14 +++++--
.../idp/module/jetty/downloadprocrun.bat | 16 +++++---
.../shibboleth/idp/module/jetty/module.properties | 31 ++++++++++++--
.../net/shibboleth/idp/module/jetty/runjetty.bat | 21 ++++++----
.../net/shibboleth/idp/module/jetty/runjetty.sh | 2 -
.../shibboleth/idp/module/jetty/setjettybase.bat | 39 ++++++++++++++++++
.../idp/module/jetty/setjettyversion.bat | 14 +++++++
.../idp/module/jetty/setprocrunversion.bat | 18 ++++++++
10 files changed, 175 insertions(+), 42 deletions(-)
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
index 4c747f0..ef71581 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
@@ -1,4 +1,4 @@
- at echo off
+REM @echo off
setlocal
REM We need a JVM
@@ -7,18 +7,31 @@ if not defined JAVA_HOME (
exit /b
)
+set IDP_HOME_WINDOWS=%~dp0..
+set IDP_HOME_UNIX=%IDP_HOME_WINDOWS:\=/%
+set JETTY_TMP=%IDP_HOME_WINDOWS%\jetty-dist\jetty-tmp
+set PRUNSRV=%PROCRUN_HOME%\amd64\prunsrv.exe
+
+
if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
echo Error: %JAVA_HOME%\bin\server\jvm.dll not found
exit /b
)
-set IDP_HOME_WINDOWS=%~dp0..
-set JETTY_BASE=%~dp0..\jetty-base
-set JETTY_HOME=%~dp0..\jetty-home
-set PRUNSRV=%IDP_HOME_WINDOWS%\shibd_idp\amd64\prunsrv.exe
+if not exist "%JETTY_HOME%\start.jar" (
+ echo Error: %JETTY_HOME%\start.jar not found
+ exit /b
+)
-for /f "tokens=* USEBACKQ" %%F in (`type "%JETTY_BASE%\jetty.base.linux"`) do (
- SET IDP_HOME_UNIX=%%F
+if not exist "%JETTY_BASE%\start.d\idp.ini" (
+ echo Error: %JETTY_BASE%\start.d\idp.ini not found
+ exit /b
+)
+
+
+if not exist "%PRUNSRV%" (
+ echo Error: %PRUNSRV% not found
+ exit /b
)
if "%1" EQU "UNINSTALL" (
@@ -29,7 +42,7 @@ if "%1" EQU "UNINSTALL" (
if "%1" EQU "EDIT" (
@echo on
- start /d "%IDP_HOME_WINDOWS%\shibd_idp" prunmgr //ES/Shibd_idp
+ start /d "%PROCRUN_HOME%" prunmgr //ES/Shibd_idp
exit /b
)
@@ -47,6 +60,10 @@ if NOT "%2" EQU "" (
SET USERNAME=LocalService
)
+REM We need to set a variable with %JETTY_HOME% in it
+SET PER_JETTY_HOME=%JETTY_HOME
+SET PER_JETTY_HOME=%PER_JETTY_HOME%%
+
REM
REM First up create and configure the procrun instance which will run jetty
@@ -61,8 +78,8 @@ REM Use PR_xxx for parameters to keep things legible and to allow for spaces in
REM
SET PR_DISPLAYNAME=Shibboleth IdP Daemon
SET PR_DESCRIPTION=Runs the Jetty Container
-SET PR_CLASSPATH=%JETTY_HOME%\start.jar
-SET PR_JVMOPTIONS=-Didp.home=%IDP_HOME_UNIX%;-Djdk.tls.ephemeralDHKeySize=2048;-Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog;-Djava.io.tmpdir=%JETTY_BASE%\tmp;-Dlogback.configurationFile=%JETTY_BASE%\resources\logback.xml;-XX:+UseG1GC
+SET PR_CLASSPATH=%PER_JETTY_HOME%\start.jar
+SET PR_JVMOPTIONS=-Didp.home=%IDP_HOME_UNIX%;-Djdk.tls.ephemeralDHKeySize=2048;-Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog;-Djava.io.tmpdir=%JETTY_TMP%;-Dlogback.configurationFile=%JETTY_BASE%\resources\logback.xml;-XX:+UseG1GC
SET PR_JVMMX=2048
SET PR_JVM=auto
SET PR_JAVAHOME=%JAVA_HOME%
@@ -92,17 +109,18 @@ REM
call "%~dp0\setacl.bat" %USERNAME%
REM
-REM We also need to lock down jetty-base-tmp
+REM We also need to create and lock down jetty-tmp
REM
-echo Setting FULL ACL on %JETTY_BASE%\tmp directory for SYSTEM, Administrators and %USERNAME%
-icacls "%JETTY_BASE%\tmp" /t /inheritance:r /grant:r "SYSTEM:(OI)(CI)(F)" "Administrators:(OI)(CI)(F)" "%USERNAME%:(OI)(CI)(F)" /q
+mkdir %JETTY_TMP%
+echo Setting FULL ACL on %JETTY_TMP% directory for SYSTEM, Administrators and %USERNAME%
+icacls "%JETTY_TMP%" /t /inheritance:r /grant:r "SYSTEM:(OI)(CI)(F)" "Administrators:(OI)(CI)(F)" "%USERNAME%:(OI)(CI)(F)" /q
if ERRORLEVEL 1 (
echo Error: Could not set ACL
exit /b
)
-echo Setting FULL ACL on %JETTY_BASE%\tmp directory content for SYSTEM, Administrators and %USERNAME%
-icacls "%JETTY_BASE%\tmp" /t /inheritance:r /grant:r SYSTEM:F Administrators:F "%USERNAME%:F" /q
+echo Setting FULL ACL on %~dp0..jetty-dist\jetty-tmp content for SYSTEM, Administrators and %USERNAME%
+icacls "%JETTY_TMP%" /t /inheritance:r /grant:r SYSTEM:F Administrators:F "%USERNAME%:F" /q
if ERRORLEVEL 1 (
echo Error: Could not set ACL
exit /b
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
index abedbdc..0d071a1 100644
--- 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
@@ -1,11 +1,17 @@
- at echo foo
+ at echo off
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)
+if exist "%~dp0..\jetty-dist\commons-daemon-%1%-bin-windows.zip" (
+ echo Error: commons-daemon-%1% already downloaded
+ exit /b
+)
+if exist "%~dp0..\jetty-dist\commons-daemon-%1%" (
+ echo Error: commons-daemon-%1% already downloaded
+ exit /b
+)
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 %*
+runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI -v %1%
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
index 9594d37..22e9b30 100644
--- 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
@@ -1,10 +1,18 @@
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 "$@"
+if [ -e "$LOCATION/jetty-dist/jetty-home-$1.tar.gz" ] ; then
+ echo "Error: $LOCATION/jetty-dist/jetty-home-$1.tar.gz already exists"
+ exit 1
+fi
+
+if [ -e "$LOCATION/jetty-dist/jetty-home-$1" ] ; then
+ echo "Error: $LOCATION/jetty-dist/jetty-home-$1 already exists"
+ exit 1
+fi
+
+$LOCATION/runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI -v $1
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
index 8fedbef..2f421ec 100644
--- 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
@@ -1,14 +1,20 @@
- at echo foo
+ at echo off
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)
+if exist "%~dp0..\jetty-dist\jetty-home-%1%" (
+ echo Error: jetty-home-%1% already downloaded
+ exit /b
+)
+if exist "%~dp0..\jetty-dist\jetty-home-%1%.tar.gz" (
+ echo Error: jetty-home-%1% already downloaded
+ exit /b
+)
set CLASSPATH=%~dp0\net.shibboleth.idp.jetty-base\jetty-cli.jar
-SET MAVEN_ARGS=--type zip --classifier bin-windows --groupId commons-daemon --artifactId commons-daemon
+SET MAVEN_ARGS=--type zip --classifier bin-windows --groupId commons-daemon --artifactId commons-daemon -v %1%
-runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI %MAVEN_ARGS% %*
+runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI %MAVEN_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 cd7a1db..3556e9a 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
@@ -74,6 +74,7 @@ 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.13.replace = true
jetty.module.14.src = /net/shibboleth/idp/module/jetty/runjetty.sh
jetty.module.14.dest = bin/runjetty.sh
@@ -85,23 +86,45 @@ 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.15.replace = 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.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.replace = 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
-
-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
\ No newline at end of file
+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
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
index fe6f4bb..4760ffc 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
@@ -1,7 +1,6 @@
- at echo off
+rem @echo off
setlocal
-
REM We need a JVM
if not defined JAVA_HOME (
echo Error: JAVA_HOME is not defined.
@@ -18,17 +17,17 @@ if not exist %JAVACMD% (
)
set IDP_HOME_WINDOWS=%~dp0..
-
-for /f "tokens=* USEBACKQ" %%F in (`type %~dp0..\jetty-base\jetty.base.linux`) do (
-SET IDP_HOME_UNIX=%%F
-)
+SET IDP_HOME_UNIX=%IDP_HOME_WINDOWS:\=/%
+SET JETTY_TMP=%IDP_HOME_WINDOWS%\jetty-dist\jetty-tmp
if not defined JETTY_HOME (
- set JETTY_HOME=%IDP_HOME_WINDOWS%\jetty-home
+ echo Error: JETTY_HOME not defined.
+ exit /b
)
if not defined JETTY_BASE (
- set JETTY_BASE=%IDP_HOME_WINDOWS%\jetty-base
+ echo Error: JETTY_BASE not defined.
+ exit /b
)
if not exist "%JETTY_HOME%\start.jar" (
@@ -36,12 +35,16 @@ if not exist "%JETTY_HOME%\start.jar" (
exit /b
)
+if not exist "%JETTY_TMP%" (
+ mkdir %JETTY_TMP%
+)
+
if not exist "%JETTY_BASE%\start.d" (
echo Error: JETTY_BASE does not point to a Jetty Base
exit /b
)
-set JVM_ARGS=-Didp.home="%IDP_HOME_UNIX%" -Djdk.tls.ephemeralDHKeySize=2048 -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog -Djava.io.tmpdir="%JETTY_BASE%/tmp" -XX:+UseG1GC
+set JVM_ARGS=-Didp.home="%IDP_HOME_UNIX%" -Djdk.tls.ephemeralDHKeySize=2048 -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog -Djava.io.tmpdir="%JETTY_TMP%" -XX:+UseG1GC
SET JETTY_ARGS=jetty.base="%JETTY_BASE%" jetty.logging.dir="%IDP_HOME_WINDOWS%\logs"
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh
index 598719c..9631562 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh
@@ -27,14 +27,12 @@ fi
IDP_HOME=$(realpath ${LOCATION}/..)
-JETTY_HOME=$LOCATION/../jetty-home
if [ ! -e "$JETTY_HOME/start.jar" ] ; then
echo "Error: JETTY_HOME is not defined correctly."
echo " $JETTY_HOME/start.jar not found"
exit 1
fi
-JETTY_BASE=$LOCATION/../jetty-base
if [ ! -d "$JETTY_BASE/start.d" ] ; then
echo "Error: JETTY_BASE is not defined correctly."
echo " $JETTY_BASE/start.d not found"
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.bat
new file mode 100644
index 0000000..a28d710
--- /dev/null
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.bat
@@ -0,0 +1,39 @@
+rem @echo off
+
+set IDP_HOME_WINDOWS=%~dp0..
+if not exist %IDP_HOME_WINDOWS%\jetty-base-%1% (
+ echo Error: jetty-base-%1% not installed
+ exit /b
+)
+
+set IDP_HOME_UNIX=%IDP_HOME_WINDOWS:\=/%
+set JETTY_TMP=%IDP_HOME_WINDOWS%\jetty-dist\jetty-tmp
+set PRUNSRV=%PROCRUN_HOME%\amd64\prunsrv.exe
+set JETTY_BASE=%IDP_HOME_WINDOWS%\jetty-base-%1%
+setx /m JETTY_BASE %JETTY_BASE%
+
+if not exist %PRUNSRV% goto no_service
+
+sc qc shibd_idp >nl:
+
+if not errorlevel 0 goto no_service
+
+SET PORTPASS=%random%-%random%-%random%-%random%
+
+SET PR_JVMOPTIONS=-Didp.home=%IDP_HOME_UNIX%;-Djdk.tls.ephemeralDHKeySize=2048;-Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog;-Djava.io.tmpdir=%JETTY_TMP%;-Dlogback.configurationFile=%JETTY_BASE%\resources\logback.xml;-XX:+UseG1GC
+
+SET PR_STARTMODE=JVM
+SET PR_STARTCLASS=org.eclipse.jetty.start.Main
+SET PR_STARTPARAMS=STOP_PORT=8963;STOP.KEY=%PORTPASS%;jetty.base=%JETTY_BASE%;jetty.logging.dir=%IDP_HOME_WINDOWS%\logs
+
+SET PR_STOPMODE=JVM
+SET PR_STOPCLASS=org.eclipse.jetty.start.Main
+SET PR_STOPPARAMS=--stop;%PR_STARTPARAMS%
+
+%PRUNSRV% //US/Shibd_idp
+
+
+:no_service
+
+echo JETTY_BASE set to be %JETTY_BASE%
+echo Restart shibd_idp to start using this version
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.bat
new file mode 100644
index 0000000..e0c7cae
--- /dev/null
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.bat
@@ -0,0 +1,14 @@
+ at echo off
+
+set IDP_HOME_WINDOWS=%~dp0..
+if not exist %IDP_HOME_WINDOWS%\jetty-dist\jetty-home-%1% (
+ echo Error: Jetty version %1% has not be downloaded and unpacked
+ exit /b
+)
+
+set JETTY_HOME=%IDP_HOME_WINDOWS%\jetty-dist\jetty-home-%1%
+setx /m JETTY_HOME %JETTY_HOME%
+
+echo JETTY_HOME set to be %JETTY_HOME%
+echo Restart the IdP to start using this version
+
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setprocrunversion.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setprocrunversion.bat
new file mode 100644
index 0000000..d4fa587
--- /dev/null
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setprocrunversion.bat
@@ -0,0 +1,18 @@
+ at echo off
+
+
+set IDP_HOME_WINDOWS=%~dp0..
+if not exist %IDP_HOME_WINDOWS%\jetty-dist\commons-daemon-%1% (
+ echo Error: Procrun version %1% has not be downloaded and unpacked
+ exit /b
+)
+
+set PROCRUN_HOME=%IDP_HOME_WINDOWS%\jetty-dist\commons-daemon-%1%
+setx /m PROCRUN_HOME %PROCRUN_HOME%
+
+sc config shibd_idp binpath="%procrun_home%amd64\prunsrv.exe //RS//Shibd_idp > nl:
+
+echo PROCRUN_HOME set to be %PROCRUN_HOME%"
+echo Restart shibd_idp to start using this version"
+
+
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list