[java-idp-jetty-base] branch 12 updated: Extra parameterization to runjetty

[Rod Widdowson]

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

rdw pushed a commit to branch 12
in repository java-idp-jetty-base.

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

The following commit(s) were added to refs/heads/12 by this push:
     new cf26578  Extra parameterization to runjetty
cf26578 is described below

commit cf26578fc395e9b17f11a6b303beaafc0b617690
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Nov 2 14:52:05 2024 +0000

    Extra parameterization to runjetty
    
    As per runclass JAVA_OPTS is put immediately after the java verb
    Any parameterization to runjetty is added at the end
---
 .../src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat     | 2 +-
 .../src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 7ea74dc..fe6f4bb 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
@@ -46,4 +46,4 @@ set JVM_ARGS=-Didp.home="%IDP_HOME_UNIX%" -Djdk.tls.ephemeralDHKeySize=2048 -Dor
 
 SET JETTY_ARGS=jetty.base="%JETTY_BASE%" jetty.logging.dir="%IDP_HOME_WINDOWS%\logs"
 
-%JAVACMD% -jar "%JETTY_HOME%/start.jar" %JVM_ARGS% %JETTY_ARGS%
+%JAVACMD%  %JAVA_OPTS% -jar "%JETTY_HOME%/start.jar" %JVM_ARGS% %JETTY_ARGS% %*
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 38c3c0d..598719c 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
@@ -45,5 +45,5 @@ JVM_ARGS="-Didp.home=$IDP_HOME -Djdk.tls.ephemeralDHKeySize=2048 -Dorg.eclipse.j
 
 JETTY_ARGS="jetty.base=$JETTY_BASE jetty.logging.dir=$IDP_HOME/logs"
 
-$JAVACMD '-jar' $JETTY_HOME/start.jar  $JVM_ARGS   $JETTY_ARGS 
+$JAVACMD  $JAVA_OPTS '-jar' $JETTY_HOME/start.jar  $JVM_ARGS  $JETTY_ARGS  "$@"
 

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